227484: type demotion (default off)

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java
index 89579928d7183e50594f557ea8a778be5cf5938f..5428ad8c3dbbf7b00b99f6412ef29a8ef9944a19 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java
@@ -371,7 +371,7 @@ public class BcelWeaver {
                                                UnwovenClassFile classFile = new UnwovenClassFile(new File(outDir, filename).getAbsolutePath(), bytes);
 
                                                if (filename.endsWith(".class")) {
-                                                       ReferenceType type = this.addClassFile(classFile,false);
+                                                       ReferenceType type = this.addClassFile(classFile, false);
                                                        StringBuffer sb = new StringBuffer();
                                                        sb.append(inFile.getAbsolutePath());
                                                        sb.append("!");
@@ -471,7 +471,7 @@ public class BcelWeaver {
                        sb.append(inPathDir.getAbsolutePath());
                        sb.append("!");
                        sb.append(filename);
-                       ReferenceType type = this.addClassFile(ucf,false);
+                       ReferenceType type = this.addClassFile(ucf, false);
                        type.setBinaryPath(sb.toString());
                }
                fis.close();
@@ -1779,7 +1779,7 @@ public class BcelWeaver {
                                getWorld().getMessageHandler().handleMessage(new Message(messageText, IMessage.ABORT, re, null));
                        }
                }
-
+               world.demote();
                // this is very odd return behavior trying to keep everyone happy
                if (dump) {
                        dumpUnchanged(classFile);