harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sjanu...@apache.org
Subject svn commit: r773522 - /harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/ClassBands.java
Date Mon, 11 May 2009 10:37:14 GMT
Author: sjanuary
Date: Mon May 11 10:37:14 2009
New Revision: 773522

URL: http://svn.apache.org/viewvc?rev=773522&view=rev
Log:
Pack200 - fix inconsistency in method and fields included in the archive

Modified:
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/ClassBands.java

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/ClassBands.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/ClassBands.java?rev=773522&r1=773521&r2=773522&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/ClassBands.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/ClassBands.java
Mon May 11 10:37:14 2009
@@ -212,9 +212,7 @@
     public void addField(int flags, String name, String desc, String signature,
             Object value) {
         flags = flags & 0xFFFF;
-        CPMethodOrField field = cpBands.addCPField(class_this[index], name,
-                desc);
-        tempFieldDesc.add(field.getDesc());
+        tempFieldDesc.add(cpBands.getCPNameAndType(name, desc));
         if (signature != null) {
             fieldSignature.add(cpBands.getCPSignature(signature));
             flags |= (1 << 19);
@@ -569,9 +567,8 @@
 
     public void addMethod(int flags, String name, String desc,
             String signature, String[] exceptions) {
-        CPMethodOrField method = cpBands.addCPMethod(class_this[index], name,
-                desc);
-        tempMethodDesc.add(method.getDesc());
+        CPNameAndType nt = cpBands.getCPNameAndType(name, desc);
+        tempMethodDesc.add(nt);
         if (signature != null) {
             methodSignature.add(cpBands.getCPSignature(signature));
             flags |= (1 << 19);



Mime
View raw message