Author: asoldano
Date: Fri Jan 24 10:37:30 2014
New Revision: 1560935
URL: http://svn.apache.org/r1560935
Log:
Merged revisions 1560933 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1560933 | asoldano | 2014-01-24 11:33:59 +0100 (Fri, 24 Jan 2014) | 2 lines
[CXF-5523] Making DestinationRegistryImpl#getTrimmedPath not static
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1560933
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java?rev=1560935&r1=1560934&r2=1560935&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
(original)
+++
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
Fri Jan 24 10:37:30 2014
@@ -141,7 +141,7 @@ public class DestinationRegistryImpl imp
* @param path
* @return trimmed path
*/
- public static String getTrimmedPath(String path) {
+ public String getTrimmedPath(String path) {
if (path == null) {
return "/";
}