[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Sat Jan 26 12:54:59 EST 2008
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client
In directory dev.open-bio.org:/tmp/cvs-serv21270/src/main/org/biomoby/client

Modified Files:
	MobyRequest.java 
Log Message:
Fixed async services' synchronous invokeService() call support, really this time
moby-live/Java/src/main/org/biomoby/client MobyRequest.java,1.36,1.37
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/MobyRequest.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/MobyRequest.java	2008/01/23 18:59:19	1.36
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/MobyRequest.java	2008/01/26 17:54:59	1.37
@@ -334,7 +334,7 @@
 		    }
 		}
 
-		if(newDataAvailable.size() > 0 && handler != null){
+		if(newDataAvailable.size() > 0){
 		    // Parse and merge the new data into the existing contents
 		    InputStream resultStream = AsyncClient.getResultStream(epr, newDataAvailable);
 		    Element mobyDOM = asyncSoapTextToMobyDOM(resultStream);
@@ -345,16 +345,18 @@
 		    }
 		    
 		    // Inform the handler that some data has been added to the response (for incremental display?)
-		    MobyRequestEvent mre = new MobyRequestEvent(finalContents, this, mservice, null, requestId);
-		    StringWriter xmlWriter = new StringWriter();
-		    MobyDataUtils.toXMLDocument(xmlWriter, finalContents);
-
-		    mre.setContentsXML(xmlWriter.toString());
-		    if(!queryIDs.isEmpty()){
-			// Send an update event only if we aren't finished yet.
-			// If we are finished, the client is going to get this event as the 
-			// invocation thread finishes up (no need to double up).
-			handler.processEvent(mre);
+		    if(handler != null){
+			MobyRequestEvent mre = new MobyRequestEvent(finalContents, this, mservice, null, requestId);
+			StringWriter xmlWriter = new StringWriter();
+			MobyDataUtils.toXMLDocument(xmlWriter, finalContents);
+			
+			mre.setContentsXML(xmlWriter.toString());
+			if(!queryIDs.isEmpty()){
+			    // Send an update event only if we aren't finished yet.
+			    // If we are finished, the client is going to get this event as the 
+			    // invocation thread finishes up (no need to double up).
+			    handler.processEvent(mre);
+			}
 		    }
 		}
 	    }