tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 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
commit c19ed27f0e
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/appeng/me/Grid.java
View file

@ -105,8 +105,9 @@ public class Grid implements IGrid
if ( gridNode.getGridStorage() != null ) if ( gridNode.getGridStorage() != null )
{ {
GridStorage gs = gridNode.getGridStorage(); GridStorage gs = gridNode.getGridStorage();
IGrid grid = gs.getGrid();
if ( gs.getGrid() == null ) if ( grid == null )
{ {
myStorage = gs; myStorage = gs;
myStorage.setGrid( this ); myStorage.setGrid( this );
@ -114,7 +115,7 @@ public class Grid implements IGrid
for (IGridCache gc : caches.values()) for (IGridCache gc : caches.values())
gc.onJoin( myStorage ); gc.onJoin( myStorage );
} }
else if ( gs.getGrid() != this ) else if ( grid != this )
{ {
if ( myStorage == null ) if ( myStorage == null )
{ {
@ -127,7 +128,7 @@ public class Grid implements IGrid
{ {
gs.addDivided( myStorage ); gs.addDivided( myStorage );
for (IGridCache gc : ((Grid) gs.getGrid()).caches.values()) for (IGridCache gc : ((Grid) grid).caches.values())
gc.onSplit( tmp ); gc.onSplit( tmp );
for (IGridCache gc : caches.values()) for (IGridCache gc : caches.values())