You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/07/02 18:30:22 UTC
svn commit: r790655 - in /cxf/branches/2.2.x-fixes: ./
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
Author: dkulp
Date: Thu Jul 2 16:30:21 2009
New Revision: 790655
URL: http://svn.apache.org/viewvc?rev=790655&view=rev
Log:
Merged revisions 790641-790642 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r790641 | dkulp | 2009-07-02 12:19:35 -0400 (Thu, 02 Jul 2009) | 2 lines
Make the wsdlLocation a new string to make sure it's not an interned
string that could result in the wsdl never being gc'd.
........
r790642 | dkulp | 2009-07-02 12:19:43 -0400 (Thu, 02 Jul 2009) | 1 line
Fix a NPE I introduced.
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 2 16:30:21 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790640
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790642
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=790655&r1=790654&r2=790655&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java Thu Jul 2 16:30:21 2009
@@ -447,7 +447,11 @@
}
public void setWsdlLocation(String wsdlLocation) {
- this.wsdlLocation = wsdlLocation;
+ if (wsdlLocation != null) {
+ this.wsdlLocation = new String(wsdlLocation);
+ } else {
+ this.wsdlLocation = null;
+ }
}
public void setBindingUri(String binding) {