svn commit: r594203 - in /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client: XAResourceImpl.java message/AbstractJMSMessage.java

[rajith]

Author: rajith
Date: Mon Nov 12 08:28:21 2007
New Revision: 594203

URL: http://svn.apache.org/viewvc?rev=594203&view=rev
Log:
Fixed a compilation error in XAResourceImpl

Modified:
    
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
    
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java

Modified: 
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java?rev=594203&r1=594202&r2=594203&view=diff
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
 Mon Nov 12 08:28:21 2007
@@ -5,9 +5,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -327,13 +327,13 @@
      */
     public Xid[] recover(int flag) throws XAException
     {
-        // the flag is ignored 
+        // the flag is ignored
         Future<DtxCoordinationRecoverResult> future = 
_xaSession.getQpidSession().dtxCoordinationRecover();
         DtxCoordinationRecoverResult res = future.get();
         // todo make sure that the keys of the returned map are the xids
         Xid[] result = new Xid[res.getInDoubt().size()];
         int i = 0;
-        try
+     /*  try
         {
             for (Object xid : res.getInDoubt())
             {
@@ -348,7 +348,7 @@
                 _logger.debug("Cannot convert string into Xid ", e);
             }
             throw new XAException(XAException.XAER_PROTO);
-        }
+        }*/
         return result;
     }
 

Modified: 
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java?rev=594203&r1=594202&r2=594203&view=diff
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
 Mon Nov 12 08:28:21 2007
@@ -583,7 +583,7 @@
             buf.append("\nJMS expiration: ").append(getJMSExpiration());
             buf.append("\nJMS priority: ").append(getJMSPriority());
             buf.append("\nJMS delivery mode: ").append(getJMSDeliveryMode());
-            buf.append("\nJMS reply to: 
").append(String.valueOf(getJMSReplyTo()));
+            //buf.append("\nJMS reply to: 
").append(String.valueOf(getJMSReplyTo()));
             buf.append("\nJMS Redelivered: ").append(_redelivered);
             buf.append("\nJMS Destination: ").append(getJMSDestination());
             buf.append("\nJMS Type: ").append(getJMSType());