Author: doogie
Date: Sat Feb 13 03:54:42 2010
New Revision: 909718
URL: http://svn.apache.org/viewvc?rev=909718&view=rev
Log:
Fix ordering of Enum converter class comparisons.
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/MiscConverters.java
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/MiscConverters.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/MiscConverters.java?rev=909718&r1=909717&r2=909718&view=diff
==============================================================================
---
ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/MiscConverters.java
(original)
+++
ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/MiscConverters.java
Sat Feb 13 03:54:42 2010
@@ -141,7 +141,7 @@
}
public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
- return sourceClass.isAssignableFrom(Enum.class) &&
targetClass.isAssignableFrom(String.class);
+ return Enum.class.isAssignableFrom(sourceClass) &&
String.class.isAssignableFrom(targetClass);
}
public String convert(Enum obj) throws ConversionException {
@@ -167,7 +167,7 @@
}
public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
- return sourceClass.isAssignableFrom(String.class) &&
targetClass.isAssignableFrom(Enum.class);
+ return String.class.isAssignableFrom(sourceClass) &&
Enum.class.isAssignableFrom(targetClass);
}
public Enum convert(String obj) throws ConversionException {
