fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #373 from yueh/fix-326

Browse Source 
Moved getGrid() (WeakReference) to a local var
This commit is contained in:
thatsIch
2014-11-02 12:19:18 +01:00
parent fc973d965e 9e48eb40a0
commit c19ed27f0e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/me/Grid.java
+4 -3
View File
@@ -105,8 +105,9 @@ public class Grid implements IGrid
if ( gridNode.getGridStorage() != null )
{
GridStorage gs = gridNode.getGridStorage();
IGrid grid = gs.getGrid();
if ( gs.getGrid() == null )
if ( grid == null )
{
myStorage = gs;
myStorage.setGrid( this );
@@ -114,7 +115,7 @@ public class Grid implements IGrid
for (IGridCache gc : caches.values())
gc.onJoin( myStorage );
}
else if ( gs.getGrid() != this )
else if ( grid != this )
{
if ( myStorage == null )
{
@@ -127,7 +128,7 @@ public class Grid implements IGrid
{
gs.addDivided( myStorage );
for (IGridCache gc : ((Grid) gs.getGrid()).caches.values())
for (IGridCache gc : ((Grid) grid).caches.values())
gc.onSplit( tmp );
for (IGridCache gc : caches.values())