Author: mbenson
Date: Thu Jan 9 23:53:57 2014
New Revision: 1556986
URL: http://svn.apache.org/r1556986
Log:
do not erroneously report that a generated class cannot be normalized because
its constructor is too busy
Modified:
commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
Modified:
commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java?rev=1556986&r1=1556985&r2=1556986&view=diff
==============================================================================
---
commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
(original)
+++
commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
Thu Jan 9 23:53:57 2014
@@ -311,6 +311,7 @@ public class Normalizer {
new LinkedHashMap<Pair<String, String>, Set<ClassWrapper>>();
for (Class<?> subtype : subtypes) {
final MutablePair<String, String> key = new MutablePair<String,
String>();
+ final MutableBoolean ignore = new MutableBoolean(false);
final MutableBoolean valid = new MutableBoolean(true);
final MutableBoolean mustRewriteConstructor = new MutableBoolean();
InputStream bytecode = null;
@@ -339,7 +340,7 @@ public class Normalizer {
@Override
public AnnotationVisitor visitAnnotation(String desc,
boolean visible) {
if
(Type.getType(Marker.class).getDescriptor().equals(desc)) {
- valid.setValue(false);
+ ignore.setValue(true);
}
return null;
}
@@ -372,6 +373,9 @@ public class Normalizer {
} finally {
IOUtils.closeQuietly(bytecode);
}
+ if (ignore.booleanValue()) {
+ continue;
+ }
if (valid.booleanValue()) {
Set<ClassWrapper> set = classMap.get(key);
if (set == null) {
