aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorchiba <chiba@30ef5769-5b8d-40dd-aea6-55b5d6557bb3>2010-04-11 16:51:16 +0000
committerchiba <chiba@30ef5769-5b8d-40dd-aea6-55b5d6557bb3>2010-04-11 16:51:16 +0000
commit604e8741298bcd2607936a1205bc746e367ea546 (patch)
tree33fadad0b0558c8267571b075929ff54d50e0052 /src/main
parentd48acaa38196acc146bd3559e88e85b098441994 (diff)
downloadjavassist-604e8741298bcd2607936a1205bc746e367ea546.tar.gz
javassist-604e8741298bcd2607936a1205bc746e367ea546.zip
fixes for JASSIST-42 and JASSIST-97
git-svn-id: http://anonsvn.jboss.org/repos/javassist/trunk@524 30ef5769-5b8d-40dd-aea6-55b5d6557bb3
Diffstat (limited to 'src/main')
-rw-r--r--src/main/javassist/util/proxy/ProxyFactory.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/javassist/util/proxy/ProxyFactory.java b/src/main/javassist/util/proxy/ProxyFactory.java
index 93b449c3..e407778a 100644
--- a/src/main/javassist/util/proxy/ProxyFactory.java
+++ b/src/main/javassist/util/proxy/ProxyFactory.java
@@ -780,7 +780,7 @@ public class ProxyFactory {
Method m = (Method)e.getValue();
int mod = m.getModifiers();
if (!Modifier.isFinal(mod) && !Modifier.isStatic(mod)
- && isVisible(mod, packageName, m) && filter.isHandled(m)) {
+ && isVisible(mod, packageName, m) && (filter == null || filter.isHandled(m))) {
setBit(signature, idx);
}
}
@@ -888,11 +888,11 @@ public class ProxyFactory {
Method meth = (Method)e.getValue();
int mod = meth.getModifiers();
if (!Modifier.isFinal(mod) && !Modifier.isStatic(mod)
- && isVisible(mod, packageName, meth))
+ && isVisible(mod, packageName, meth))
if (testBit(signature, index))
- if (methodFilter == null || methodFilter.isHandled(meth))
- override(className, meth, prefix, index,
- keyToDesc(key), cf, cp);
+ if (methodFilter == null || methodFilter.isHandled(meth))
+ override(className, meth, prefix, index,
+ keyToDesc(key), cf, cp);
index++;
}