You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2005/01/17 00:38:05 UTC
cvs commit: ws-axis/java/src/org/apache/axis/enum Enum.java Scope.java Style.java Use.java
dims 2005/01/16 15:38:05
Modified: java/src/org/apache/axis/enum Enum.java Scope.java
Style.java Use.java
Log:
Fix for AXIS-1767 - Style and other Enums are not serializable enumerated types
Revision Changes Path
1.18 +0 -4 ws-axis/java/src/org/apache/axis/enum/Enum.java
Index: Enum.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/enum/Enum.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Enum.java 25 Feb 2004 14:02:39 -0000 1.17
+++ Enum.java 16 Jan 2005 23:38:05 -0000 1.18
@@ -79,10 +79,6 @@
obj.value == value);
}
- private Object readResolve() throws java.io.ObjectStreamException {
- return getType().getEnum(value);
- }
-
public abstract static class Type implements java.io.Serializable {
private final String name;
private final Enum[] enums;
1.12 +3 -0 ws-axis/java/src/org/apache/axis/enum/Scope.java
Index: Scope.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/enum/Scope.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Scope.java 28 Oct 2004 14:04:35 -0000 1.11
+++ Scope.java 16 Jan 2005 23:38:05 -0000 1.12
@@ -69,6 +69,9 @@
return type.getEnumNames();
}
+ private Object readResolve() throws java.io.ObjectStreamException {
+ return type.getScope(value);
+ }
public static class Type extends Enum.Type {
private Type() {
super("scope", new Enum[] {
1.12 +4 -0 ws-axis/java/src/org/apache/axis/enum/Style.java
Index: Style.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/enum/Style.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Style.java 28 Oct 2004 14:04:35 -0000 1.11
+++ Style.java 16 Jan 2005 23:38:05 -0000 1.12
@@ -128,6 +128,10 @@
return type.getEnumNames();
}
+ private Object readResolve() throws java.io.ObjectStreamException {
+ return type.getStyle(value);
+ }
+
public static class Type extends Enum.Type {
private Type() {
super("style", new Enum[] {
1.9 +4 -0 ws-axis/java/src/org/apache/axis/enum/Use.java
Index: Use.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/enum/Use.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Use.java 28 Oct 2004 14:04:35 -0000 1.8
+++ Use.java 16 Jan 2005 23:38:05 -0000 1.9
@@ -71,6 +71,10 @@
return type.getEnumNames();
}
+ private Object readResolve() throws java.io.ObjectStreamException {
+ return type.getUse(value);
+ }
+
public static class Type extends Enum.Type {
private Type() {
super("style", new Enum[] {