You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ng...@apache.org on 2006/12/13 18:08:22 UTC

svn commit: r486745 - /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ThreadContextMigratorUtil.java

Author: ngallardo
Date: Wed Dec 13 09:08:21 2006
New Revision: 486745

URL: http://svn.apache.org/viewvc?view=rev&rev=486745
Log:
Fixing an NPE in JAX-WS on a bad endpoint address.

Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ThreadContextMigratorUtil.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ThreadContextMigratorUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ThreadContextMigratorUtil.java?view=diff&rev=486745&r1=486744&r2=486745
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ThreadContextMigratorUtil.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ThreadContextMigratorUtil.java Wed Dec 13 09:08:21 2006
@@ -66,6 +66,11 @@
   public static void performMigrationToThread(String threadContextMigratorListID, MessageContext msgContext)
   throws AxisFault
   {
+    if (msgContext == null)
+    {
+      return;
+    }
+      
     List migratorList = (List)msgContext.getConfigurationContext().getProperty(threadContextMigratorListID);
     
     if (migratorList != null)
@@ -89,6 +94,11 @@
    */
   public static void performThreadCleanup(String threadContextMigratorListID, MessageContext msgContext)
   {
+    if (msgContext == null)
+    {
+      return;
+    }
+      
     List migratorList = (List)msgContext.getConfigurationContext().getProperty(threadContextMigratorListID);
     
     if (migratorList != null)
@@ -114,6 +124,11 @@
   public static void performMigrationToContext(String threadContextMigratorListID, MessageContext msgContext)
   throws AxisFault
   {
+    if (msgContext == null)
+    {
+      return;
+    }
+      
     List migratorList = (List)msgContext.getConfigurationContext().getProperty(threadContextMigratorListID);
 
     if (migratorList != null)
@@ -137,6 +152,11 @@
    */
   public static void performContextCleanup(String threadContextMigratorListID, MessageContext msgContext)
   {
+    if (msgContext == null)
+    {
+      return;
+    }
+      
     List migratorList = (List)msgContext.getConfigurationContext().getProperty(threadContextMigratorListID);
 
     if (migratorList != null)



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org