commit f6e0625fbb195e0aefb1db858b1a3db5afb2b867
author Neil GM Richards <neil_richards@uk.ibm.com> Sun May 24 22:37:10 2015 -0400
committer Neil GM Richards <neil_richards@uk.ibm.com> Sun May 24 22:37:10 2015 -0400
tree 107e5009113119b493c7c2a65a3557405d354dff
parent 40c437d695857e4e6f5b76d02f08ee954232b826
parent 4f2a5a5223c86e6829641df7f88cf700b5de63b0

Merge branch 'enum_type_fix' into 'ibm-trunk'

Enum type fix

See merge request !46

yoko-rmi-impl/src/main/java/org/apache/yoko/rmi/impl/ValueDescriptor.java

diff --git a/yoko-rmi-impl/src/main/java/org/apache/yoko/rmi/impl/ValueDescriptor.java b/yoko-rmi-impl/src/main/java/org/apache/yoko/rmi/impl/ValueDescriptor.java
index 8361218..6d7eb3e 100755
--- a/yoko-rmi-impl/src/main/java/org/apache/yoko/rmi/impl/ValueDescriptor.java
+++ b/yoko-rmi-impl/src/main/java/org/apache/yoko/rmi/impl/ValueDescriptor.java
@@ -74,6 +74,8 @@
 public class ValueDescriptor extends TypeDescriptor {
     static final Logger logger = Logger.getLogger(ValueDescriptor.class.getName());
 
+    private boolean _is_enum;
+
     private boolean _is_externalizable;
 
     private boolean _is_serializable;
@@ -144,6 +146,7 @@
     }
 
     long getSerialVersionUID() {
+        if (_is_enum) return 0L;
         if (_serial_version_uid_field != null) {
 
             try {
@@ -174,6 +177,7 @@
         final Class<?> type = getJavaClass();
         final Class<?> superClass = type.getSuperclass();
 
+        _is_enum = Enum.class.isAssignableFrom(type);
         _is_rmi_stub = RMIStub.class.isAssignableFrom(type);
         _is_externalizable = Externalizable.class.isAssignableFrom(type);
         _is_serializable = Serializable.class.isAssignableFrom(type);