Author: azeez
Date: Thu Jan 6 16:56:34 2011
New Revision: 1055937
URL: http://svn.apache.org/viewvc?rev=1055937&view=rev
Log:
Fix for AXIS2-3796 (Applying patch provided by Hans G Knudsen)
Fix for AXIS2-3386 (Based on suggestion in the patch by Jihad Abdul-Latif)
Modified:
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/idl/values/EnumValue.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
Modified:
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/idl/values/EnumValue.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/idl/values/EnumValue.java?rev=1055937&r1=1055936&r2=1055937&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/idl/values/EnumValue.java
(original)
+++
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/idl/values/EnumValue.java
Thu Jan 6 16:56:34 2011
@@ -54,6 +54,12 @@ public class EnumValue extends AbstractV
outputStream.write_long(index);
}
+ @Override
+ public int hashCode() {
+ return getValueAsString().hashCode();
+ }
+
+ @Override
public boolean equals(Object o) {
if (o instanceof EnumValue) {
if (getValueAsString().equals(((EnumValue) o).getValueAsString()))
{
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java?rev=1055937&r1=1055936&r2=1055937&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
Thu Jan 6 16:56:34 2011
@@ -456,7 +456,11 @@ class OutInAxisOperationClient extends O
if (callback != null) {
callback.onError(fault);
} else if (axisCallback != null) {
- axisCallback.onError(fault);
+ if (options.isExceptionToBeThrownOnSOAPFault()) {
+ axisCallback.onError(fault);
+ } else {
+ axisCallback.onFault(response);
+ }
}
} else {
