Return-Path: X-Original-To: apmail-aries-commits-archive@www.apache.org Delivered-To: apmail-aries-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A10E08E2A for ; Sat, 17 Sep 2011 11:06:00 +0000 (UTC) Received: (qmail 74932 invoked by uid 500); 17 Sep 2011 11:06:00 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 74859 invoked by uid 500); 17 Sep 2011 11:05:59 -0000 Mailing-List: contact commits-help@aries.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aries.apache.org Delivered-To: mailing list commits@aries.apache.org Received: (qmail 74846 invoked by uid 99); 17 Sep 2011 11:05:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Sep 2011 11:05:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Sep 2011 11:05:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1B6F523889E3; Sat, 17 Sep 2011 11:05:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1171946 - in /aries/trunk/proxy/proxy-impl/src: main/java/org/apache/aries/proxy/impl/interfaces/ test/java/org/apache/aries/blueprint/proxy/ Date: Sat, 17 Sep 2011 11:05:37 -0000 To: commits@aries.apache.org From: timothyjward@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110917110538.1B6F523889E3@eris.apache.org> Author: timothyjward Date: Sat Sep 17 11:05:37 2011 New Revision: 1171946 URL: http://svn.apache.org/viewvc?rev=1171946&view=rev Log: ARIES-746: Fix Object methods on pure interface proxies - avoid implementing interfaces in a random order (In particular make sure that we get the same behaviour from Sun and IBM derived VMs) Modified: aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceProxyGenerator.java aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/ProxyClassLoader.java aries/trunk/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/InterfaceProxyingTest.java Modified: aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceProxyGenerator.java URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceProxyGenerator.java?rev=1171946&r1=1171945&r2=1171946&view=diff ============================================================================== --- aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceProxyGenerator.java (original) +++ aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceProxyGenerator.java Sat Sep 17 11:05:37 2011 @@ -23,6 +23,7 @@ import java.lang.reflect.Constructor; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Map; import java.util.WeakHashMap; import java.util.concurrent.Callable; @@ -55,7 +56,7 @@ public final class InterfaceProxyGenerat ProxyClassLoader pcl = null; - HashSet> classSet = createSet(ifaces); + LinkedHashSet> classSet = createSet(ifaces); synchronized (cache) { WeakReference ref = cache.get(client); @@ -92,8 +93,8 @@ public final class InterfaceProxyGenerat * @param ifaces * @return */ - private static HashSet> createSet(Collection> ifaces) { - HashSet> classes = new HashSet>(); + private static LinkedHashSet> createSet(Collection> ifaces) { + LinkedHashSet> classes = new LinkedHashSet>(); for(Class c : ifaces) { //If we already have a class contained then we have already covered its hierarchy if(classes.add(c)) Modified: aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/ProxyClassLoader.java URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/ProxyClassLoader.java?rev=1171946&r1=1171945&r2=1171946&view=diff ============================================================================== --- aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/ProxyClassLoader.java (original) +++ aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/ProxyClassLoader.java Sat Sep 17 11:05:37 2011 @@ -5,6 +5,7 @@ import java.security.PermissionCollectio import java.security.Permissions; import java.security.ProtectionDomain; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -32,8 +33,8 @@ final class ProxyClassLoader extends Cla } /** A {@link Map} of classes we already know */ - private final ConcurrentMap>, String> classes = - new ConcurrentHashMap>, String>(); + private final ConcurrentMap>, String> classes = + new ConcurrentHashMap>, String>(); private final ConcurrentMap> locatedClasses = new ConcurrentHashMap>(); @@ -96,7 +97,7 @@ final class ProxyClassLoader extends Cla return false; } - public Class createProxyClass(HashSet> createSet) throws UnableToProxyException { + public Class createProxyClass(LinkedHashSet> createSet) throws UnableToProxyException { String className = classes.get(createSet); Modified: aries/trunk/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/InterfaceProxyingTest.java URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/InterfaceProxyingTest.java?rev=1171946&r1=1171945&r2=1171946&view=diff ============================================================================== --- aries/trunk/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/InterfaceProxyingTest.java (original) +++ aries/trunk/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/InterfaceProxyingTest.java Sat Sep 17 11:05:37 2011 @@ -197,10 +197,10 @@ public class InterfaceProxyingTest { // obeys hashCode and equals, they *are* on the interface assertTrue(proxied.equals(Arrays.asList("one", "two", "three"))); - assertEquals(Collection.class.getMethod("equals", Object.class), listener.getLastMethod()); + assertEquals(List.class.getMethod("equals", Object.class), listener.getLastMethod()); listener.clear(); assertEquals(Arrays.asList("one", "two", "three").hashCode(), proxied.hashCode()); - assertEquals(Collection.class.getMethod("hashCode"), listener.getLastMethod()); + assertEquals(List.class.getMethod("hashCode"), listener.getLastMethod()); listener.clear(); // and toString assertEquals(list.toString(), proxied.toString());