[Fb-contrib-commit] SF.net SVN: fb-contrib:[1214] trunk/fb-contrib/src/com/mebigfatguy/ fbcontrib/detect/FieldCouldBeLocal.java

[<dbr...@us...>]

Revision: 1214
          http://fb-contrib.svn.sourceforge.net/fb-contrib/?rev=1214&view=rev
Author:   dbrosius
Date:     2009-07-03 05:03:14 +0000 (Fri, 03 Jul 2009)

Log Message:
-----------
Fix for 2813241, hopefully

Modified Paths:
--------------
    trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/FieldCouldBeLocal.java

Modified: trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/FieldCouldBeLocal.java
===================================================================
--- trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/FieldCouldBeLocal.java	2009-07-03 04:34:52 UTC (rev 1213)
+++ trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/FieldCouldBeLocal.java	2009-07-03 05:03:14 UTC (rev 1214)
@@ -217,12 +217,14 @@
 				if (ins instanceof FieldInstruction) {
 					FieldInstruction fi = (FieldInstruction) ins;
 					String fieldName = fi.getFieldName(cpg);
-					uncheckedFields.remove(fieldName);
+					boolean justRemoved = uncheckedFields.remove(fieldName);
 					
 					if (ins instanceof GETFIELD) {
-						localizableFields.remove(fieldName);
-						if (localizableFields.isEmpty())
-							return;
+						if (justRemoved) {
+							localizableFields.remove(fieldName);
+							if (localizableFields.isEmpty())
+								return;
+						}
 					} else {
 						FieldInfo finfo = localizableFields.get(fieldName);
 						if (finfo != null)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.