svn commit: r1221648 - in /axis/axis2/java/sandesha/branches/1_6: ./ modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java

[veithen]

Author: veithen
Date: Wed Dec 21 08:51:16 2011
New Revision: 1221648

URL: http://svn.apache.org/viewvc?rev=1221648&view=rev
Log:
Merged r1221487 to the 1.6 branch.

Modified:
    axis/axis2/java/sandesha/branches/1_6/   (props changed)
    
axis/axis2/java/sandesha/branches/1_6/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java

Propchange: axis/axis2/java/sandesha/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 21 08:51:16 2011
@@ -1 +1 @@
-/axis/axis2/java/sandesha/trunk:1072332-1072333,1081570,1090216,1098145,1137383,1145793,1186431,1212832,1214978,1220960
+/axis/axis2/java/sandesha/trunk:1072332-1072333,1081570,1090216,1098145,1137383,1145793,1186431,1212832,1214978,1220960,1221487

Modified: 
axis/axis2/java/sandesha/branches/1_6/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java?rev=1221648&r1=1221647&r2=1221648&view=diff
==============================================================================
--- 
axis/axis2/java/sandesha/branches/1_6/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
 (original)
+++ 
axis/axis2/java/sandesha/branches/1_6/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
 Wed Dec 21 08:51:16 2011
@@ -233,15 +233,15 @@ public class SandeshaTestCase extends Te
                boolean errorReported = false;
                String resultStr;
                
-               public boolean isComplete() {
+               public synchronized boolean isComplete() {
                        return completed;
                }
                
-               public boolean isErrorReported() {
+               public synchronized boolean isErrorReported() {
                        return errorReported;
                }
 
-               public String getResult () {
+               public synchronized String getResult () {
                        return resultStr;
                }
                
@@ -249,23 +249,23 @@ public class SandeshaTestCase extends Te
                        this.name = name;
                }
                
-               public void onComplete() {
+               public synchronized void onComplete() {
                        completed = true;
                }
 
-               public void onMessage(MessageContext result) {
+               public synchronized void onMessage(MessageContext result) {
                        SOAPBody body = result.getEnvelope().getBody();
                        OMElement contents = body.getFirstElement();
                        this.resultStr = checkEchoOMBlock(contents);
                        System.out.println("TestCallback got text: '" + 
resultStr + "'");
                }
                
-               public void onFault(MessageContext result) {
+               public synchronized void onFault(MessageContext result) {
                        errorReported = true;
                        System.out.println("TestCallback got fault: " + 
result.getEnvelope());
                }
 
-               public void onError (Exception e) {
+               public synchronized void onError (Exception e) {
                        errorReported = true;
                        System.out.println("TestCallback got exception");
                        e.printStackTrace();