[jboss-svn-commits] JBL Code SVN: r27842 - labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/agent/adapter.

[jboss-svn-commits at lists.jboss.org]

Author: adinn
Date: 2009-07-10 12:24:11 -0400 (Fri, 10 Jul 2009)
New Revision: 27842

Modified:
   labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/agent/adapter/InvokeCheckAdapter.java
   labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/agent/adapter/InvokeTriggerAdapter.java
Log:
ensured fully package qualified class names can be use to qualify the method provided in an AT CALL location specifier - fixes reopened BYTEMAN-10

Modified: labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/agent/adapter/InvokeCheckAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/agent/adapter/InvokeCheckAdapter.java	2009-07-10 16:20:45 UTC (rev 27841)
+++ labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/agent/adapter/InvokeCheckAdapter.java	2009-07-10 16:24:11 UTC (rev 27842)
@@ -112,7 +112,7 @@
                 return false;
             }
             if (calledClass != null) {
-                if (!calledClass.equals(owner)) {
+                if (!calledClass.equals(TypeHelper.internalizeClass(owner))) {
                     // TODO check for unqualified names
                     // if the called class has no package qualification and the owner class does
                     // then we can still match if the unqualified owner name equals the called class

Modified: labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/agent/adapter/InvokeTriggerAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/agent/adapter/InvokeTriggerAdapter.java	2009-07-10 16:20:45 UTC (rev 27841)
+++ labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/agent/adapter/InvokeTriggerAdapter.java	2009-07-10 16:24:11 UTC (rev 27842)
@@ -147,7 +147,7 @@
                 return false;
             }
             if (calledClass != null) {
-                if (!calledClass.equals(owner)) {
+                if (!calledClass.equals(TypeHelper.internalizeClass(owner))) {
                     // TODO check for unqualified names
                     // if the called class has no package qualification and the owner class does
                     // then we can still match if the unqualified owner name equals the called class