svn commit: r897701 - in /jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic: FieldInstruction.java Type.java

[tcurdt]

Author: tcurdt
Date: Sun Jan 10 20:32:51 2010
New Revision: 897701

URL: http://svn.apache.org/viewvc?rev=897701&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=48280 by Enrico Gueli

fixed FieldInstruction.getFieldSize()


Modified:
    
jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldInstruction.java
    jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java

Modified: 
jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldInstruction.java
URL: 
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldInstruction.java?rev=897701&r1=897700&r2=897701&view=diff
==============================================================================
--- 
jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldInstruction.java 
(original)
+++ 
jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldInstruction.java 
Sun Jan 10 20:32:51 2010
@@ -54,7 +54,7 @@
     /** @return size of field (1 or 2)
      */
     protected int getFieldSize( ConstantPoolGen cpg ) {
-       return Type.getTypeSize(getSignature(cpg));
+       return Type.size(Type.getTypeSize(getSignature(cpg)));
     }
 
 

Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java
URL: 
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java?rev=897701&r1=897700&r2=897701&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java 
(original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java Sun Jan 
10 20:32:51 2010
@@ -18,6 +18,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.apache.bcel.Constants;
 import org.apache.bcel.classfile.ClassFormatException;
 import org.apache.bcel.classfile.Utility;
@@ -308,15 +309,15 @@
         return sb.toString();
     }
     
-    private static int size(int coded) {
+    static int size(int coded) {
        return coded & 3;
     }
     
-    private static int consumed(int coded) {
+    static int consumed(int coded) {
        return coded >> 2;
     }
     
-    private static int encode(int size, int consumed) {
+    static int encode(int size, int consumed) {
        return consumed << 2 | size;
     }
     



---------------------------------------------------------------------
To unsubscribe, e-mail: bcel-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: bcel-dev-h...@jakarta.apache.org