diff options
| author | Rajith Muditha Attapattu <rajith@apache.org> | 2007-11-12 16:28:21 +0000 |
|---|---|---|
| committer | Rajith Muditha Attapattu <rajith@apache.org> | 2007-11-12 16:28:21 +0000 |
| commit | 8abdaa7d28a546ae4a75ff3e54a192b100506041 (patch) | |
| tree | 19f2e5174ca9cf6f6085cf59ceaa9f84de657f07 /java/client/src/main | |
| parent | 8335a1bbe8a190158c18f7fee128c00e01ee6aa6 (diff) | |
| download | qpid-python-8abdaa7d28a546ae4a75ff3e54a192b100506041.tar.gz | |
Fixed a compilation error in XAResourceImpl
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@594203 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/client/src/main')
| -rw-r--r-- | java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java | 10 | ||||
| -rw-r--r-- | java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java b/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java index 75218fc32e..d70a70110c 100644 --- a/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java +++ b/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java @@ -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 class XAResourceImpl implements XAResource */ 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 @@ public class XAResourceImpl implements XAResource _logger.debug("Cannot convert string into Xid ", e); } throw new XAException(XAException.XAER_PROTO); - } + }*/ return result; } diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java index 2dfeb19268..800f092b52 100644 --- a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java +++ b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java @@ -583,7 +583,7 @@ public abstract class AbstractJMSMessage extends AMQMessage implements org.apach 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()); |
