PatchSet 5930
Date: 2005/01/27 15:17:07
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced RMI skeletion and Stub files back to Classpath's version
2005-01-27 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/javalib/gnu/java/rmi/dgc/DGCImpl_Skel.java,
libraries/javalib/gnu/java/rmi/dgc/DGCImpl_Stub.java,
libraries/javalib/gnu/java/rmi/registry/RegistryImpl_Skel.java,
libraries/javalib/gnu/java/rmi/registry/RegistryImpl_Stub.java:
Reverted the files back to Classpath's version since they are generated.
It would be cool to fix rmic to not generate such files, though, to
avoid the jikes warnings in generated code.
Members:
ChangeLog:1.3469->1.3470
libraries/javalib/gnu/java/rmi/dgc/DGCImpl_Skel.java:1.2->1.3
libraries/javalib/gnu/java/rmi/dgc/DGCImpl_Stub.java:1.2->1.3
libraries/javalib/gnu/java/rmi/registry/RegistryImpl_Skel.java:1.2->1.3
libraries/javalib/gnu/java/rmi/registry/RegistryImpl_Stub.java:1.2->1.3
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3469 kaffe/ChangeLog:1.3470
--- kaffe/ChangeLog:1.3469 Thu Jan 27 14:10:21 2005
+++ kaffe/ChangeLog Thu Jan 27 15:17:07 2005
@@ -1,5 +1,15 @@
2005-01-27 Dalibor Topic <[EMAIL PROTECTED]>
+ * libraries/javalib/gnu/java/rmi/dgc/DGCImpl_Skel.java,
+ libraries/javalib/gnu/java/rmi/dgc/DGCImpl_Stub.java,
+ libraries/javalib/gnu/java/rmi/registry/RegistryImpl_Skel.java,
+ libraries/javalib/gnu/java/rmi/registry/RegistryImpl_Stub.java:
+ Reverted the files back to Classpath's version since they are
generated.
+ It would be cool to fix rmic to not generate such files, though, to
+ avoid the jikes warnings in generated code.
+
+2005-01-27 Dalibor Topic <[EMAIL PROTECTED]>
+
Resynced with GNU Classpath.
2005-01-27 Andrew John Hughes <[EMAIL PROTECTED]>
Index: kaffe/libraries/javalib/gnu/java/rmi/dgc/DGCImpl_Skel.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/dgc/DGCImpl_Skel.java:1.2
kaffe/libraries/javalib/gnu/java/rmi/dgc/DGCImpl_Skel.java:1.3
--- kaffe/libraries/javalib/gnu/java/rmi/dgc/DGCImpl_Skel.java:1.2 Fri Dec
10 21:17:44 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/dgc/DGCImpl_Skel.java Thu Jan 27
15:17:10 2005
@@ -74,16 +74,16 @@
switch (opnum) {
case 0:
{
- java.rmi.server.ObjID[] param_0;
- long param_1;
- java.rmi.dgc.VMID param_2;
- boolean param_3;
+ java.rmi.server.ObjID[] $param_0;
+ long $param_1;
+ java.rmi.dgc.VMID $param_2;
+ boolean $param_3;
try {
java.io.ObjectInput in = call.getInputStream();
- param_0 = (java.rmi.server.ObjID[])in.readObject();
- param_1 = (long)in.readLong();
- param_2 = (java.rmi.dgc.VMID)in.readObject();
- param_3 = (boolean)in.readBoolean();
+ $param_0 = (java.rmi.server.ObjID[])in.readObject();
+ $param_1 = (long)in.readLong();
+ $param_2 = (java.rmi.dgc.VMID)in.readObject();
+ $param_3 = (boolean)in.readBoolean();
}
catch (java.io.IOException e) {
@@ -95,7 +95,7 @@
finally {
call.releaseInputStream();
}
- server.clean(param_0, param_1, param_2, param_3);
+ server.clean($param_0, $param_1, $param_2, $param_3);
try {
java.io.ObjectOutput out = call.getResultStream(true);
}
@@ -107,14 +107,14 @@
case 1:
{
- java.rmi.server.ObjID[] param_0;
- long param_1;
- java.rmi.dgc.Lease param_2;
+ java.rmi.server.ObjID[] $param_0;
+ long $param_1;
+ java.rmi.dgc.Lease $param_2;
try {
java.io.ObjectInput in = call.getInputStream();
- param_0 = (java.rmi.server.ObjID[])in.readObject();
- param_1 = (long)in.readLong();
- param_2 = (java.rmi.dgc.Lease)in.readObject();
+ $param_0 = (java.rmi.server.ObjID[])in.readObject();
+ $param_1 = (long)in.readLong();
+ $param_2 = (java.rmi.dgc.Lease)in.readObject();
}
catch (java.io.IOException e) {
@@ -126,10 +126,10 @@
finally {
call.releaseInputStream();
}
- java.rmi.dgc.Lease result = server.dirty(param_0, param_1,
param_2);
+ java.rmi.dgc.Lease $result = server.dirty($param_0, $param_1,
$param_2);
try {
java.io.ObjectOutput out = call.getResultStream(true);
- out.writeObject(result);
+ out.writeObject($result);
}
catch (java.io.IOException e) {
throw new java.rmi.MarshalException("error marshalling
return", e);
Index: kaffe/libraries/javalib/gnu/java/rmi/dgc/DGCImpl_Stub.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/dgc/DGCImpl_Stub.java:1.2
kaffe/libraries/javalib/gnu/java/rmi/dgc/DGCImpl_Stub.java:1.3
--- kaffe/libraries/javalib/gnu/java/rmi/dgc/DGCImpl_Stub.java:1.2 Fri Dec
10 21:17:44 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/dgc/DGCImpl_Stub.java Thu Jan 27
15:17:10 2005
@@ -55,15 +55,15 @@
new java.rmi.server.Operation("java.rmi.dgc.Lease
dirty(java.rmi.server.ObjID[], long, java.rmi.dgc.Lease)")
};
- private static java.lang.reflect.Method method_clean_0;
- private static java.lang.reflect.Method method_dirty_1;
+ private static java.lang.reflect.Method $method_clean_0;
+ private static java.lang.reflect.Method $method_dirty_1;
static {
try {
java.rmi.server.RemoteRef.class.getMethod("invoke", new
java.lang.Class[] { java.rmi.Remote.class, java.lang.reflect.Method.class,
java.lang.Object[].class, long.class });
useNewInvoke = true;
- method_clean_0 = gnu.java.rmi.dgc.DGCImpl.class.getMethod("clean",
new java.lang.Class[] {java.rmi.server.ObjID[].class, long.class,
java.rmi.dgc.VMID.class, boolean.class});
- method_dirty_1 = gnu.java.rmi.dgc.DGCImpl.class.getMethod("dirty",
new java.lang.Class[] {java.rmi.server.ObjID[].class, long.class,
java.rmi.dgc.Lease.class});
+ $method_clean_0 =
gnu.java.rmi.dgc.DGCImpl.class.getMethod("clean", new java.lang.Class[]
{java.rmi.server.ObjID[].class, long.class, java.rmi.dgc.VMID.class,
boolean.class});
+ $method_dirty_1 =
gnu.java.rmi.dgc.DGCImpl.class.getMethod("dirty", new java.lang.Class[]
{java.rmi.server.ObjID[].class, long.class, java.rmi.dgc.Lease.class});
}
catch (java.lang.NoSuchMethodException e) {
@@ -78,19 +78,19 @@
super(ref);
}
- public void clean(java.rmi.server.ObjID[] param_0, long param_1,
java.rmi.dgc.VMID param_2, boolean param_3) throws java.rmi.RemoteException {
+ public void clean(java.rmi.server.ObjID[] $param_0, long $param_1,
java.rmi.dgc.VMID $param_2, boolean $param_3) throws java.rmi.RemoteException {
try {
if (useNewInvoke) {
- ref.invoke(this, method_clean_0, new java.lang.Object[]
{param_0, new java.lang.Long(param_1), param_2, new
java.lang.Boolean(param_3)}, -5803803475088455571L);
+ ref.invoke(this, $method_clean_0, new java.lang.Object[]
{$param_0, new java.lang.Long($param_1), $param_2, new
java.lang.Boolean($param_3)}, -5803803475088455571L);
}
else {
java.rmi.server.RemoteCall call =
ref.newCall((java.rmi.server.RemoteObject)this, operations, 0, interfaceHash);
try {
java.io.ObjectOutput out = call.getOutputStream();
- out.writeObject(param_0);
- out.writeLong(param_1);
- out.writeObject(param_2);
- out.writeBoolean(param_3);
+ out.writeObject($param_0);
+ out.writeLong($param_1);
+ out.writeObject($param_2);
+ out.writeBoolean($param_3);
}
catch (java.io.IOException e) {
throw new java.rmi.MarshalException("error marshalling
arguments", e);
@@ -115,29 +115,29 @@
}
}
- public java.rmi.dgc.Lease dirty(java.rmi.server.ObjID[] param_0, long
param_1, java.rmi.dgc.Lease param_2) throws java.rmi.RemoteException {
+ public java.rmi.dgc.Lease dirty(java.rmi.server.ObjID[] $param_0, long
$param_1, java.rmi.dgc.Lease $param_2) throws java.rmi.RemoteException {
try {
if (useNewInvoke) {
- java.lang.Object result = ref.invoke(this, method_dirty_1, new
java.lang.Object[] {param_0, new java.lang.Long(param_1), param_2},
-8139341527526761862L);
- return ((java.rmi.dgc.Lease)result);
+ java.lang.Object $result = ref.invoke(this, $method_dirty_1,
new java.lang.Object[] {$param_0, new java.lang.Long($param_1), $param_2},
-8139341527526761862L);
+ return ((java.rmi.dgc.Lease)$result);
}
else {
java.rmi.server.RemoteCall call =
ref.newCall((java.rmi.server.RemoteObject)this, operations, 1, interfaceHash);
try {
java.io.ObjectOutput out = call.getOutputStream();
- out.writeObject(param_0);
- out.writeLong(param_1);
- out.writeObject(param_2);
+ out.writeObject($param_0);
+ out.writeLong($param_1);
+ out.writeObject($param_2);
}
catch (java.io.IOException e) {
throw new java.rmi.MarshalException("error marshalling
arguments", e);
}
ref.invoke(call);
- java.rmi.dgc.Lease result;
+ java.rmi.dgc.Lease $result;
try {
java.io.ObjectInput in = call.getInputStream();
- result = (java.rmi.dgc.Lease)in.readObject();
- return (result);
+ $result = (java.rmi.dgc.Lease)in.readObject();
+ return ($result);
}
catch (java.io.IOException e) {
throw new java.rmi.UnmarshalException("error unmarshalling
return", e);
Index: kaffe/libraries/javalib/gnu/java/rmi/registry/RegistryImpl_Skel.java
diff -u
kaffe/libraries/javalib/gnu/java/rmi/registry/RegistryImpl_Skel.java:1.2
kaffe/libraries/javalib/gnu/java/rmi/registry/RegistryImpl_Skel.java:1.3
--- kaffe/libraries/javalib/gnu/java/rmi/registry/RegistryImpl_Skel.java:1.2
Fri Dec 10 21:17:45 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/registry/RegistryImpl_Skel.java
Thu Jan 27 15:17:11 2005
@@ -86,12 +86,12 @@
switch (opnum) {
case 0:
{
- java.lang.String param_0;
- java.rmi.Remote param_1;
+ java.lang.String $param_0;
+ java.rmi.Remote $param_1;
try {
java.io.ObjectInput in = call.getInputStream();
- param_0 = (java.lang.String)in.readObject();
- param_1 = (java.rmi.Remote)in.readObject();
+ $param_0 = (java.lang.String)in.readObject();
+ $param_1 = (java.rmi.Remote)in.readObject();
}
catch (java.io.IOException e) {
@@ -103,7 +103,7 @@
finally {
call.releaseInputStream();
}
- server.bind(param_0, param_1);
+ server.bind($param_0, $param_1);
try {
java.io.ObjectOutput out = call.getResultStream(true);
}
@@ -125,10 +125,10 @@
finally {
call.releaseInputStream();
}
- java.lang.String[] result = server.list();
+ java.lang.String[] $result = server.list();
try {
java.io.ObjectOutput out = call.getResultStream(true);
- out.writeObject(result);
+ out.writeObject($result);
}
catch (java.io.IOException e) {
throw new java.rmi.MarshalException("error marshalling
return", e);
@@ -138,10 +138,10 @@
case 2:
{
- java.lang.String param_0;
+ java.lang.String $param_0;
try {
java.io.ObjectInput in = call.getInputStream();
- param_0 = (java.lang.String)in.readObject();
+ $param_0 = (java.lang.String)in.readObject();
}
catch (java.io.IOException e) {
@@ -153,10 +153,10 @@
finally {
call.releaseInputStream();
}
- java.rmi.Remote result = server.lookup(param_0);
+ java.rmi.Remote $result = server.lookup($param_0);
try {
java.io.ObjectOutput out = call.getResultStream(true);
- out.writeObject(result);
+ out.writeObject($result);
}
catch (java.io.IOException e) {
throw new java.rmi.MarshalException("error marshalling
return", e);
@@ -166,12 +166,12 @@
case 3:
{
- java.lang.String param_0;
- java.rmi.Remote param_1;
+ java.lang.String $param_0;
+ java.rmi.Remote $param_1;
try {
java.io.ObjectInput in = call.getInputStream();
- param_0 = (java.lang.String)in.readObject();
- param_1 = (java.rmi.Remote)in.readObject();
+ $param_0 = (java.lang.String)in.readObject();
+ $param_1 = (java.rmi.Remote)in.readObject();
}
catch (java.io.IOException e) {
@@ -183,7 +183,7 @@
finally {
call.releaseInputStream();
}
- server.rebind(param_0, param_1);
+ server.rebind($param_0, $param_1);
try {
java.io.ObjectOutput out = call.getResultStream(true);
}
@@ -195,10 +195,10 @@
case 4:
{
- java.lang.String param_0;
+ java.lang.String $param_0;
try {
java.io.ObjectInput in = call.getInputStream();
- param_0 = (java.lang.String)in.readObject();
+ $param_0 = (java.lang.String)in.readObject();
}
catch (java.io.IOException e) {
@@ -210,7 +210,7 @@
finally {
call.releaseInputStream();
}
- server.unbind(param_0);
+ server.unbind($param_0);
try {
java.io.ObjectOutput out = call.getResultStream(true);
}
Index: kaffe/libraries/javalib/gnu/java/rmi/registry/RegistryImpl_Stub.java
diff -u
kaffe/libraries/javalib/gnu/java/rmi/registry/RegistryImpl_Stub.java:1.2
kaffe/libraries/javalib/gnu/java/rmi/registry/RegistryImpl_Stub.java:1.3
--- kaffe/libraries/javalib/gnu/java/rmi/registry/RegistryImpl_Stub.java:1.2
Fri Dec 10 21:17:45 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/registry/RegistryImpl_Stub.java
Thu Jan 27 15:17:11 2005
@@ -58,21 +58,21 @@
new java.rmi.server.Operation("void unbind(java.lang.String)")
};
- private static java.lang.reflect.Method method_bind_0;
- private static java.lang.reflect.Method method_list_1;
- private static java.lang.reflect.Method method_lookup_2;
- private static java.lang.reflect.Method method_rebind_3;
- private static java.lang.reflect.Method method_unbind_4;
+ private static java.lang.reflect.Method $method_bind_0;
+ private static java.lang.reflect.Method $method_list_1;
+ private static java.lang.reflect.Method $method_lookup_2;
+ private static java.lang.reflect.Method $method_rebind_3;
+ private static java.lang.reflect.Method $method_unbind_4;
static {
try {
java.rmi.server.RemoteRef.class.getMethod("invoke", new
java.lang.Class[] { java.rmi.Remote.class, java.lang.reflect.Method.class,
java.lang.Object[].class, long.class });
useNewInvoke = false;
- method_bind_0 =
gnu.java.rmi.registry.RegistryImpl.class.getMethod("bind", new
java.lang.Class[] {java.lang.String.class, java.rmi.Remote.class});
- method_list_1 =
gnu.java.rmi.registry.RegistryImpl.class.getMethod("list", new
java.lang.Class[] {});
- method_lookup_2 =
gnu.java.rmi.registry.RegistryImpl.class.getMethod("lookup", new
java.lang.Class[] {java.lang.String.class});
- method_rebind_3 =
gnu.java.rmi.registry.RegistryImpl.class.getMethod("rebind", new
java.lang.Class[] {java.lang.String.class, java.rmi.Remote.class});
- method_unbind_4 =
gnu.java.rmi.registry.RegistryImpl.class.getMethod("unbind", new
java.lang.Class[] {java.lang.String.class});
+ $method_bind_0 =
gnu.java.rmi.registry.RegistryImpl.class.getMethod("bind", new
java.lang.Class[] {java.lang.String.class, java.rmi.Remote.class});
+ $method_list_1 =
gnu.java.rmi.registry.RegistryImpl.class.getMethod("list", new
java.lang.Class[] {});
+ $method_lookup_2 =
gnu.java.rmi.registry.RegistryImpl.class.getMethod("lookup", new
java.lang.Class[] {java.lang.String.class});
+ $method_rebind_3 =
gnu.java.rmi.registry.RegistryImpl.class.getMethod("rebind", new
java.lang.Class[] {java.lang.String.class, java.rmi.Remote.class});
+ $method_unbind_4 =
gnu.java.rmi.registry.RegistryImpl.class.getMethod("unbind", new
java.lang.Class[] {java.lang.String.class});
}
catch (java.lang.NoSuchMethodException e) {
@@ -87,17 +87,17 @@
super(ref);
}
- public void bind(java.lang.String param_0, java.rmi.Remote param_1) throws
java.rmi.AccessException, java.rmi.AlreadyBoundException,
java.rmi.RemoteException {
+ public void bind(java.lang.String $param_0, java.rmi.Remote $param_1)
throws java.rmi.AccessException, java.rmi.AlreadyBoundException,
java.rmi.RemoteException {
try {
if (useNewInvoke) {
- ref.invoke(this, method_bind_0, new java.lang.Object[]
{param_0, param_1}, 7583982177005850366L);
+ ref.invoke(this, $method_bind_0, new java.lang.Object[]
{$param_0, $param_1}, 7583982177005850366L);
}
else {
java.rmi.server.RemoteCall call =
ref.newCall((java.rmi.server.RemoteObject)this, operations, 0, interfaceHash);
try {
java.io.ObjectOutput out = call.getOutputStream();
- out.writeObject(param_0);
- out.writeObject(param_1);
+ out.writeObject($param_0);
+ out.writeObject($param_1);
}
catch (java.io.IOException e) {
throw new java.rmi.MarshalException("error marshalling
arguments", e);
@@ -131,8 +131,8 @@
public java.lang.String[] list() throws java.rmi.AccessException,
java.rmi.RemoteException {
try {
if (useNewInvoke) {
- java.lang.Object result = ref.invoke(this, method_list_1,
null, 2571371476350237748L);
- return ((java.lang.String[])result);
+ java.lang.Object $result = ref.invoke(this, $method_list_1,
null, 2571371476350237748L);
+ return ((java.lang.String[])$result);
}
else {
java.rmi.server.RemoteCall call =
ref.newCall((java.rmi.server.RemoteObject)this, operations, 1, interfaceHash);
@@ -143,11 +143,11 @@
throw new java.rmi.MarshalException("error marshalling
arguments", e);
}
ref.invoke(call);
- java.lang.String[] result;
+ java.lang.String[] $result;
try {
java.io.ObjectInput in = call.getInputStream();
- result = (java.lang.String[])in.readObject();
- return (result);
+ $result = (java.lang.String[])in.readObject();
+ return ($result);
}
catch (java.io.IOException e) {
throw new java.rmi.UnmarshalException("error unmarshalling
return", e);
@@ -168,27 +168,27 @@
}
}
- public java.rmi.Remote lookup(java.lang.String param_0) throws
java.rmi.AccessException, java.rmi.NotBoundException, java.rmi.RemoteException {
+ public java.rmi.Remote lookup(java.lang.String $param_0) throws
java.rmi.AccessException, java.rmi.NotBoundException, java.rmi.RemoteException {
try {
if (useNewInvoke) {
- java.lang.Object result = ref.invoke(this, method_lookup_2,
new java.lang.Object[] {param_0}, -7538657168040752697L);
- return ((java.rmi.Remote)result);
+ java.lang.Object $result = ref.invoke(this, $method_lookup_2,
new java.lang.Object[] {$param_0}, -7538657168040752697L);
+ return ((java.rmi.Remote)$result);
}
else {
java.rmi.server.RemoteCall call =
ref.newCall((java.rmi.server.RemoteObject)this, operations, 2, interfaceHash);
try {
java.io.ObjectOutput out = call.getOutputStream();
- out.writeObject(param_0);
+ out.writeObject($param_0);
}
catch (java.io.IOException e) {
throw new java.rmi.MarshalException("error marshalling
arguments", e);
}
ref.invoke(call);
- java.rmi.Remote result;
+ java.rmi.Remote $result;
try {
java.io.ObjectInput in = call.getInputStream();
- result = (java.rmi.Remote)in.readObject();
- return (result);
+ $result = (java.rmi.Remote)in.readObject();
+ return ($result);
}
catch (java.io.IOException e) {
throw new java.rmi.UnmarshalException("error unmarshalling
return", e);
@@ -212,17 +212,17 @@
}
}
- public void rebind(java.lang.String param_0, java.rmi.Remote param_1)
throws java.rmi.AccessException, java.rmi.RemoteException {
+ public void rebind(java.lang.String $param_0, java.rmi.Remote $param_1)
throws java.rmi.AccessException, java.rmi.RemoteException {
try {
if (useNewInvoke) {
- ref.invoke(this, method_rebind_3, new java.lang.Object[]
{param_0, param_1}, -8381844669958460146L);
+ ref.invoke(this, $method_rebind_3, new java.lang.Object[]
{$param_0, $param_1}, -8381844669958460146L);
}
else {
java.rmi.server.RemoteCall call =
ref.newCall((java.rmi.server.RemoteObject)this, operations, 3, interfaceHash);
try {
java.io.ObjectOutput out = call.getOutputStream();
- out.writeObject(param_0);
- out.writeObject(param_1);
+ out.writeObject($param_0);
+ out.writeObject($param_1);
}
catch (java.io.IOException e) {
throw new java.rmi.MarshalException("error marshalling
arguments", e);
@@ -250,16 +250,16 @@
}
}
- public void unbind(java.lang.String param_0) throws
java.rmi.AccessException, java.rmi.NotBoundException, java.rmi.RemoteException {
+ public void unbind(java.lang.String $param_0) throws
java.rmi.AccessException, java.rmi.NotBoundException, java.rmi.RemoteException {
try {
if (useNewInvoke) {
- ref.invoke(this, method_unbind_4, new java.lang.Object[]
{param_0}, 7305022919901907578L);
+ ref.invoke(this, $method_unbind_4, new java.lang.Object[]
{$param_0}, 7305022919901907578L);
}
else {
java.rmi.server.RemoteCall call =
ref.newCall((java.rmi.server.RemoteObject)this, operations, 4, interfaceHash);
try {
java.io.ObjectOutput out = call.getOutputStream();
- out.writeObject(param_0);
+ out.writeObject($param_0);
}
catch (java.io.IOException e) {
throw new java.rmi.MarshalException("error marshalling
arguments", e);
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
