You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by sb...@apache.org on 2019/03/14 04:01:43 UTC

svn commit: r1855481 - in /aries/branches/java6support/proxy: ./ pom.xml proxy-impl/pom.xml proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyMethodAdapter.java

Author: sbratton
Date: Thu Mar 14 04:01:43 2019
New Revision: 1855481

URL: http://svn.apache.org/viewvc?rev=1855481&view=rev
Log:
merge ^/aries/trunk/proxy - r1844786 thru r1855479 into proxy

Modified:
    aries/branches/java6support/proxy/   (props changed)
    aries/branches/java6support/proxy/pom.xml
    aries/branches/java6support/proxy/proxy-impl/pom.xml
    aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyMethodAdapter.java

Propchange: aries/branches/java6support/proxy/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 14 04:01:43 2019
@@ -1,2 +1,2 @@
 /aries/branches/1.0-prototype/proxy:1306564-1337594
-/aries/trunk/proxy:1728111-1844785
+/aries/trunk/proxy:1728111-1855479

Modified: aries/branches/java6support/proxy/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/java6support/proxy/pom.xml?rev=1855481&r1=1855480&r2=1855481&view=diff
==============================================================================
--- aries/branches/java6support/proxy/pom.xml (original)
+++ aries/branches/java6support/proxy/pom.xml Thu Mar 14 04:01:43 2019
@@ -44,4 +44,3 @@
     </modules>
 
 </project>
-

Modified: aries/branches/java6support/proxy/proxy-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/java6support/proxy/proxy-impl/pom.xml?rev=1855481&r1=1855480&r2=1855481&view=diff
==============================================================================
--- aries/branches/java6support/proxy/proxy-impl/pom.xml (original)
+++ aries/branches/java6support/proxy/proxy-impl/pom.xml Thu Mar 14 04:01:43 2019
@@ -32,7 +32,7 @@
     <artifactId>org.apache.aries.proxy</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Aries Proxy Service</name>
-    <version>1.1.3-SNAPSHOT</version>
+    <version>1.1.5-SNAPSHOT</version>
     <description>
         This bundle contains the proxy service implementation for Apache Aries
     </description>

Modified: aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyMethodAdapter.java
URL: http://svn.apache.org/viewvc/aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyMethodAdapter.java?rev=1855481&r1=1855480&r2=1855481&view=diff
==============================================================================
--- aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyMethodAdapter.java (original)
+++ aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyMethodAdapter.java Thu Mar 14 04:01:43 2019
@@ -227,7 +227,7 @@ public abstract class AbstractWovenProxy
     loadLocal(dispatchTarget);
     checkCast(methodDeclaringType);
     loadArgs();
-    if(isMethodDeclaringTypeInterface && !isDefaultMethod) {
+    if(isMethodDeclaringTypeInterface) {
       invokeInterface(methodDeclaringType, currentTransformMethod);
     } else {
       invokeVirtual(methodDeclaringType, currentTransformMethod);