From bfb16e3dc469bd08db5ae6069a44a087a1af8396 Mon Sep 17 00:00:00 2001
From: Sian January <sjanuary@apache.org>
Date: Tue, 28 Sep 2010 14:46:22 +0000
Subject: [PATCH] Pack200 - Fix for minor bug found when working in java 6
 branch

git-svn-id: https://svn.apache.org/repos/asf/harmony/enhanced/java/trunk@1002189 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/harmony/pack200/BcBands.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/harmony/pack200/BcBands.java b/src/main/java/org/apache/harmony/pack200/BcBands.java
index 3b541e4..92c65fe 100644
--- a/src/main/java/org/apache/harmony/pack200/BcBands.java
+++ b/src/main/java/org/apache/harmony/pack200/BcBands.java
@@ -438,14 +438,13 @@ public class BcBands extends BandSet {
             bcLabelRelativeOffsets.add(byteCodeOffset);
         }
         int padding = (byteCodeOffset + 1) % 4 == 0 ? 0 : 4 - ((byteCodeOffset + 1) % 4);
-        byteCodeOffset += padding + 8 + 8 * keys.length;
+        byteCodeOffset += 1 + padding + 8 + 8 * keys.length;
         updateRenumbering();
     }
 
     public void visitMethodInsn(int opcode, String owner, String name,
             String desc) {
         byteCodeOffset += 3;
-        updateRenumbering();
         switch (opcode) {
         case 182: // invokevirtual
         case 183: // invokespecial
@@ -495,11 +494,13 @@ public class BcBands extends BandSet {
             bcCodes.add(opcode);
             break;
         case 185: // invokeinterface
+            byteCodeOffset += 2;
             CPMethodOrField cpIMethod = cpBands.getCPIMethod(owner, name, desc);
             bcIMethodRef.add(cpIMethod);
             bcCodes.add(INVOKEINTERFACE);
             break;
         }
+        updateRenumbering();
     }
 
     public void visitMultiANewArrayInsn(String desc, int dimensions) {
@@ -522,7 +523,7 @@ public class BcBands extends BandSet {
             bcLabel.add(labels[i]);
             bcLabelRelativeOffsets.add(byteCodeOffset);
         }
-        int padding = (byteCodeOffset + 1) % 4 == 0 ? 0 : 4 - ((byteCodeOffset + 1) % 4);
+        int padding = byteCodeOffset % 4 == 0 ? 0 : 4 - (byteCodeOffset % 4);
         byteCodeOffset+= (padding + 12 + 4 * labels.length);
         updateRenumbering();
     }