svn commit: r1299795 - in /cxf/branches/2.5.x-fixes: ./ rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java

[ay]

Author: ay
Date: Mon Mar 12 19:13:49 2012
New Revision: 1299795

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

........
  r1299707 | ay | 2012-03-12 16:17:47 +0100 (Mon, 12 Mar 2012) | 1 line
  
  handle null-EndpointReference in WS-RM Destination and Source for JMX monitor
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    
cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 12 19:13:49 2012
@@ -1 +1 @@
-/cxf/trunk:1297296,1298601-1298624,1298830,1299635,1299682
+/cxf/trunk:1297296,1298601-1298624,1298830,1299635,1299682,1299707

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

Modified: 
cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java?rev=1299795&r1=1299794&r2=1299795&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java
 Mon Mar 12 19:13:49 2012
@@ -39,6 +39,7 @@ import org.apache.cxf.management.annotat
 import org.apache.cxf.management.annotation.ManagedOperationParameter;
 import org.apache.cxf.management.annotation.ManagedOperationParameters;
 import org.apache.cxf.management.annotation.ManagedResource;
+import org.apache.cxf.ws.addressing.EndpointReferenceType;
 import org.apache.cxf.ws.rm.DestinationSequence.DeferredAcknowledgment;
 import org.apache.cxf.ws.rm.v200702.Identifier;
 import 
org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement.AcknowledgementRange;
@@ -396,6 +397,13 @@ public class ManagedRMEndpoint implement
         return destination.getSequence(identifier);
     }
 
+    private static String getAddressValue(EndpointReferenceType epr) {
+        if (null != epr && null != epr.getAddress()) {
+            return epr.getAddress().getValue();
+        }
+        return null;
+    }
+    
     private CompositeData getSourceSequenceProperties(SourceSequence ss) 
throws JMException {
         if (null == ss) {
             throw new IllegalArgumentException("no sequence");
@@ -404,7 +412,7 @@ public class ManagedRMEndpoint implement
         Object[] ssv = new Object[]{ss.getIdentifier().getValue(), 
ss.getCurrentMessageNr(), 
                                     ss.getExpires(), ss.isLastMessage(),
                                     
manager.getRetransmissionQueue().countUnacknowledged(ss),
-                                    ss.getTarget().getAddress().getValue()};
+                                    getAddressValue(ss.getTarget())};
         
         CompositeData ssps = new CompositeDataSupport(sourceSequenceType, 
                                                       SOURCE_SEQUENCE_NAMES, 
ssv);
@@ -417,7 +425,7 @@ public class ManagedRMEndpoint implement
         }
         Object[] dsv = new Object[]{ds.getIdentifier().getValue(), 
ds.getLastMessageNumber(), 
                                     ds.getCorrelationID(),
-                                    ds.getAcksTo().getAddress().getValue()};
+                                    getAddressValue(ds.getAcksTo())};
         
         CompositeData dsps = new CompositeDataSupport(destinationSequenceType, 
                                                       
DESTINATION_SEQUENCE_NAMES, dsv);