Bug 137968 – Java 1.5 patch for burlap-3.0.8

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description Martin Jansa 2006-06-25 12:56:58 UTC]

I have to use attached diff to successfully merge.

[Comment 1 Martin Jansa 2006-06-25 12:57:22 UTC]

Created attachment 90139 [details, diff]
add package spec to Proxy (ambiguous java.lang.reflect.Proxy and java.net.Proxy)

[Comment 2 Martin Jansa 2006-08-15 11:26:40 UTC]

Created attachment 94338 [details, diff]
files/burlap-3.0.8-jdk15.patch

[Comment 3 Martin Jansa 2006-08-15 11:27:10 UTC]

Created attachment 94339 [details, diff]
burlap-3.0.8-r1.ebuild.patch

[Comment 4 Martin Jansa 2006-08-15 11:28:35 UTC]

Comment on attachment 94338 [details, diff]
files/burlap-3.0.8-jdk15.patch

diff -uNr burlap-3.0.8.orig/src/com/caucho/burlap/client/BurlapProxyFactory.java burlap-3.0.8/src/com/caucho/burlap/client/BurlapProxyFactory.java
--- burlap-3.0.8.orig/src/com/caucho/burlap/client/BurlapProxyFactory.java      2006-08-15 10:47:30.000000000 +0200
+++ burlap-3.0.8/src/com/caucho/burlap/client/BurlapProxyFactory.java   2006-08-15 10:48:19.000000000 +0200
@@ -202,7 +202,7 @@
   {
     BurlapProxy handler = new BurlapProxy(this, new URL(url));

-    return Proxy.newProxyInstance(api.getClassLoader(),
+    return java.lang.reflect.Proxy.newProxyInstance(api.getClassLoader(),
                                   new Class[] { api,
                                                 BurlapRemoteObject.class },
                                   handler);
diff -uNr burlap-3.0.8.orig/src/com/caucho/burlap/client/BurlapProxy.java burlap-3.0.8/src/com/caucho/burlap/client/BurlapProxy.java
--- burlap-3.0.8.orig/src/com/caucho/burlap/client/BurlapProxy.java     2006-08-15 10:47:30.000000000 +0200
+++ burlap-3.0.8/src/com/caucho/burlap/client/BurlapProxy.java  2006-08-15 10:48:08.000000000 +0200
@@ -94,10 +94,10 @@
     if (methodName.equals("equals") &&
         params.length == 1 && params[0].equals(Object.class)) {
       Object value = args[0];
-      if (value == null || ! Proxy.isProxyClass(value.getClass()))
+      if (value == null || ! java.lang.reflect.Proxy.isProxyClass(value.getClass()))
         return new Boolean(false);

-      BurlapProxy handler = (BurlapProxy) Proxy.getInvocationHandler(value);
+      BurlapProxy handler = (BurlapProxy) java.lang.reflect.Proxy.getInvocationHandler(value);

       return new Boolean(_url.equals(handler.getURL()));
     }

[Comment 5 Martin Jansa 2006-08-15 11:30:11 UTC]

Created attachment 94340 [details, diff]
files/burlap-3.0.8-jdk15.patch

Sorry that previous patch was from hessian

[Comment 6 Petteri Räty (RETIRED) 2007-01-16 17:26:26 UTC]

(In reply to comment #5)
> Created an attachment (id=94340) [edit]
> files/burlap-3.0.8-jdk15.patch
> 
> Sorry that previous patch was from hessian
> 

Applied. Thanks for this one too.