cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r764043 - in /cxf/branches/2.1.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
Date Fri, 10 Apr 2009 20:42:07 GMT
Author: dkulp
Date: Fri Apr 10 20:42:06 2009
New Revision: 764043

URL: http://svn.apache.org/viewvc?rev=764043&view=rev
Log:
Merged revisions 763200 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r763200 | sergeyb | 2009-04-08 08:07:17 -0400 (Wed, 08 Apr 2009) | 1 line
  
  Fixing NPE caused by JAXRS endpoints
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 10 20:42:06 2009
@@ -1 +1 @@
-/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567
+/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java?rev=764043&r1=764042&r2=764043&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
Fri Apr 10 20:42:06 2009
@@ -276,6 +276,12 @@
                 transport.getDestinations());
         Collections.sort(destinations, new Comparator<ServletDestination>() {
             public int compare(ServletDestination o1, ServletDestination o2) {
+                if (o1.getEndpointInfo().getInterface() == null) {
+                    return -1;
+                }
+                if (o2.getEndpointInfo().getInterface() == null) {
+                    return 1;
+                }
                 return o1.getEndpointInfo().getInterface().getName()
                         .getLocalPart().compareTo(
                                 o2.getEndpointInfo().getInterface().getName()



Mime
View raw message