Author: rfeng
Date: Mon Oct  1 10:39:07 2007
New Revision: 581024

URL: http://svn.apache.org/viewvc?rev=581024&view=rev
Log:
Apply the patch from Mark Combellack for TUSCANY-1819. Thank you, Mark!

Modified:
    
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java

Modified: 
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java?rev=581024&r1=581023&r2=581024&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
 Mon Oct  1 10:39:07 2007
@@ -74,7 +74,11 @@
 
     @SuppressWarnings("unchecked")
     public <CB> CB getCallback() {
-        return (CB) getCallbackReference().getService();
+        CallableReference<CB> cb = getCallbackReference(); 
+        if (cb == null) {
+            return null;
+        }
+        return cb.getService();
     }
 
     @SuppressWarnings("unchecked")



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to