svn commit: r1143029 - in /axis/axis2/java/core/branches/1_6: ./ modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java

[sagara]

Author: sagara
Date: Tue Jul  5 12:43:02 2011
New Revision: 1143029

URL: http://svn.apache.org/viewvc?rev=1143029&view=rev
Log:
Merged r1139484 to the 1.6 branch (AXIS2-5086).

Modified:
    axis/axis2/java/core/branches/1_6/   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java

Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul  5 12:43:02 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1085927,1087073,1088239,1088248-1088249,1088251,1088268,1088904,1091178,1091191,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1137153,1137159,1138144,1138203,1139448
+/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1085927,1087073,1088239,1088248-1088249,1088251,1088268,1088904,1091178,1091191,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1137153,1137159,1138144,1138203,1139448,1139484

Modified: 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java?rev=1143029&r1=1143028&r2=1143029&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
 Tue Jul  5 12:43:02 2011
@@ -120,6 +120,10 @@ public abstract class AbstractMessageRec
                 throw fault;
             }
         } finally {
+            //We can call the serviceContext destroy method for request scope 
services
+            if 
(Constants.SCOPE_REQUEST.equals(messageCtx.getAxisService().getScope())) {
+                
DependencyManager.destroyServiceObject(messageCtx.getServiceContext());
+            }
             restoreThreadContext(tc);
         }
     }