qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grk...@apache.org
Subject svn commit: r979294 - in /qpid/trunk/qpid/java: client/src/main/grammar/ client/src/main/java/org/apache/qpid/client/ client/src/main/java/org/apache/qpid/filter/ client/src/main/java/org/apache/qpid/njms/ common/src/main/java/org/apache/qpid/ common/s...
Date Mon, 26 Jul 2010 14:09:55 GMT
Author: grkvlt
Date: Mon Jul 26 14:09:55 2010
New Revision: 979294

URL: http://svn.apache.org/viewvc?rev=979294&view=rev
Log:
QPID-2675: Remove obsolete QpidException

Removed:
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/njms/ExceptionHelper.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ErrorCode.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/QpidException.java
Modified:
    qpid/trunk/qpid/java/client/src/main/grammar/SelectorParser.jj
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/Expression.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
    qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/ManagementClient.java
    qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QpidService.java

Modified: qpid/trunk/qpid/java/client/src/main/grammar/SelectorParser.jj
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/grammar/SelectorParser.jj?rev=979294&r1=979293&r2=979294&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/grammar/SelectorParser.jj (original)
+++ qpid/trunk/qpid/java/client/src/main/grammar/SelectorParser.jj Mon Jul 26 14:09:55 2010
@@ -66,7 +66,7 @@ package org.apache.qpid.filter.selector;
 import java.io.StringReader;
 import java.util.ArrayList;
 
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.filter.ArithmeticExpression;
 import org.apache.qpid.filter.BooleanExpression;
 import org.apache.qpid.filter.ComparisonExpression;
@@ -87,14 +87,14 @@ public class SelectorParser {
         this(new StringReader(""));
     }
 
-    public BooleanExpression parse(String sql) throws QpidException {
+    public BooleanExpression parse(String sql) throws AMQInternalException {
         this.ReInit(new StringReader(sql));
 
         try {
             return this.JmsSelector();
         }
         catch (Throwable e) {
-	        throw new QpidException(sql,null,e);
+	        throw new AMQInternalException(sql,e);
         }
 
     }

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java?rev=979294&r1=979293&r2=979294&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
(original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
Mon Jul 26 14:09:55 2010
@@ -24,9 +24,9 @@ import org.apache.qpid.client.message.*;
 import org.apache.qpid.client.protocol.AMQProtocolHandler;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.transport.*;
-import org.apache.qpid.QpidException;
 import org.apache.qpid.filter.MessageFilter;
 import org.apache.qpid.filter.JMSSelectorFilter;
 
@@ -93,7 +93,7 @@ public class BasicMessageConsumer_0_10 e
             {
                 _filter = new JMSSelectorFilter(messageSelector);
             }
-            catch (QpidException e)
+            catch (AMQInternalException e)
             {
                 throw new InvalidSelectorException("cannot create consumer because of selector
issue");
             }

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java?rev=979294&r1=979293&r2=979294&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
(original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
Mon Jul 26 14:09:55 2010
@@ -25,7 +25,7 @@ import javax.jms.JMSException;
 import javax.jms.Message;
 
 import org.apache.qpid.AMQException;
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.client.failover.FailoverException;
 import org.apache.qpid.client.message.*;
 import org.apache.qpid.client.protocol.AMQProtocolHandler;
@@ -54,7 +54,7 @@ public class BasicMessageConsumer_0_8 ex
                 JMSSelectorFilter _filter = new JMSSelectorFilter(messageSelector);
             }
         }
-        catch (QpidException e)
+        catch (AMQInternalException e)
         {
             throw new InvalidSelectorException("cannot create consumer because of selector
issue");
         }

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java?rev=979294&r1=979293&r2=979294&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java Mon
Jul 26 14:09:55 2010
@@ -21,7 +21,7 @@ import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInvalidArgumentException;
 import org.apache.qpid.dtx.XidImpl;
 import org.apache.qpid.transport.*;
 
@@ -350,19 +350,8 @@ public class XAResourceImpl implements X
     
     private void setDtxTimeout(int timeout) throws XAException
     {
-        try
-        {
-            _xaSession.getQpidSession()
+        _xaSession.getQpidSession()
                     .dtxSetTimeout(XidImpl.convert(_xid), timeout);
-        }
-        catch (QpidException e)
-        {
-            if (_logger.isDebugEnabled())
-            {
-                _logger.debug("Cannot convert Xid into String format ", e);
-            }
-            throw new XAException(XAException.XAER_PROTO);
-        }
     }
 
     /**
@@ -518,7 +507,7 @@ public class XAResourceImpl implements X
      * convert a generic xid into qpid format
      * @param xid xid to be converted
      * @return the qpid formated xid
-     * @throws XAException when xid is null or when it cannot be converted. 
+     * @throws XAException when xid is null 
      */
     private org.apache.qpid.transport.Xid convertXid(Xid xid) throws XAException
     {
@@ -527,19 +516,7 @@ public class XAResourceImpl implements X
             // Invalid arguments were given.
             throw new XAException(XAException.XAER_INVAL);
         }
-        try
-        {
-            return XidImpl.convert(xid);
-        }
-        catch (QpidException e)
-        {
-            if (_logger.isDebugEnabled())
-            {
-                _logger.debug("Cannot convert Xid into String format ", e);
-            }
-            //A resource manager error has occured in the transaction branch.
-            throw new XAException(XAException.XAER_RMERR);
-        }
+        return XidImpl.convert(xid);
     }
 
 }

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java?rev=979294&r1=979293&r2=979294&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
(original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
Mon Jul 26 14:09:55 2010
@@ -17,7 +17,7 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
@@ -241,7 +241,7 @@ public abstract class ArithmeticExpressi
         }
     }
 
-    public Object evaluate(AbstractJMSMessage message) throws QpidException
+    public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
     {
         Object lvalue = left.evaluate(message);
         if (lvalue == null)

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java?rev=979294&r1=979293&r2=979294&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
(original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
Mon Jul 26 14:09:55 2010
@@ -17,7 +17,7 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
@@ -28,6 +28,6 @@ import org.apache.qpid.client.message.Ab
 public interface BooleanExpression extends Expression
 {
 
-    public boolean matches(AbstractJMSMessage message) throws QpidException;
+    public boolean matches(AbstractJMSMessage message) throws AMQInternalException;
 
 }

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java?rev=979294&r1=979293&r2=979294&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
(original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
Mon Jul 26 14:09:55 2010
@@ -17,13 +17,13 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
-import org.apache.qpid.client.message.AbstractJMSMessage;
-
 import java.util.HashSet;
 import java.util.List;
 import java.util.regex.Pattern;
 
+import org.apache.qpid.AMQInternalException;
+import org.apache.qpid.client.message.AbstractJMSMessage;
+
 /**
  * A filter performing a comparison of two objects
  */
@@ -131,7 +131,7 @@ public abstract class ComparisonExpressi
         /**
          *  org.apache.activemq.filter.Expression#evaluate(MessageEvaluationContext)
          */
-        public Object evaluate(AbstractJMSMessage message) throws QpidException
+        public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
         {
 
             Object rv = this.getRight().evaluate(message);
@@ -151,7 +151,7 @@ public abstract class ComparisonExpressi
             return likePattern.matcher((String) rv).matches() ? Boolean.TRUE : Boolean.FALSE;
         }
 
-        public boolean matches(AbstractJMSMessage message) throws QpidException
+        public boolean matches(AbstractJMSMessage message) throws AMQInternalException
         {
             Object object = evaluate(message);
 
@@ -234,7 +234,7 @@ public abstract class ComparisonExpressi
         return new ComparisonExpression(left, right)
             {
 
-                public Object evaluate(AbstractJMSMessage message) throws QpidException
+                public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
                 {
                     Object lv = left.evaluate(message);
                     Object rv = right.evaluate(message);
@@ -417,7 +417,7 @@ public abstract class ComparisonExpressi
         super(left, right);
     }
 
-    public Object evaluate(AbstractJMSMessage message) throws QpidException
+    public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
     {
         Comparable lv = (Comparable) left.evaluate(message);
         if (lv == null)
@@ -579,7 +579,7 @@ public abstract class ComparisonExpressi
 
     protected abstract boolean asBoolean(int answer);
 
-    public boolean matches(AbstractJMSMessage message) throws QpidException
+    public boolean matches(AbstractJMSMessage message) throws AMQInternalException
     {
         Object object = evaluate(message);
 

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java?rev=979294&r1=979293&r2=979294&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
(original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
Mon Jul 26 14:09:55 2010
@@ -17,11 +17,11 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
-import org.apache.qpid.client.message.AbstractJMSMessage;
-
 import java.math.BigDecimal;
 
+import org.apache.qpid.AMQInternalException;
+import org.apache.qpid.client.message.AbstractJMSMessage;
+
 /**
  * Represents a constant expression
  */
@@ -35,7 +35,7 @@ public class ConstantExpression implemen
             super(value);
         }
 
-        public boolean matches(AbstractJMSMessage message) throws QpidException
+        public boolean matches(AbstractJMSMessage message) throws AMQInternalException
         {
             Object object = evaluate(message);
 
@@ -114,7 +114,7 @@ public class ConstantExpression implemen
         this.value = value;
     }
 
-    public Object evaluate(AbstractJMSMessage message) throws QpidException
+    public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
     {
         return value;
     }

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/Expression.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/Expression.java?rev=979294&r1=979293&r2=979294&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/Expression.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/Expression.java Mon Jul
26 14:09:55 2010
@@ -17,7 +17,7 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
@@ -29,6 +29,7 @@ public interface Expression
     /**
      * @param message The message to evaluate
      * @return the value of this expression
+     * @throws AMQInternalException 
      */
-    public Object evaluate(AbstractJMSMessage message) throws QpidException;
+    public Object evaluate(AbstractJMSMessage message) throws AMQInternalException;
 }

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java?rev=979294&r1=979293&r2=979294&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
(original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
Mon Jul 26 14:09:55 2010
@@ -17,11 +17,11 @@
  */
 package org.apache.qpid.filter;
 
+import org.apache.qpid.AMQInternalException;
+import org.apache.qpid.client.message.AbstractJMSMessage;
+import org.apache.qpid.filter.selector.SelectorParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.filter.selector.SelectorParser;
-import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
 public class JMSSelectorFilter implements MessageFilter
@@ -34,7 +34,7 @@ public class JMSSelectorFilter implement
     private String _selector;
     private BooleanExpression _matcher;
 
-    public JMSSelectorFilter(String selector) throws QpidException
+    public JMSSelectorFilter(String selector) throws AMQInternalException
     {
         _selector = selector;
         if (JMSSelectorFilter._logger.isDebugEnabled())
@@ -56,7 +56,7 @@ public class JMSSelectorFilter implement
             }
             return match;
         }
-        catch (QpidException e)
+        catch (AMQInternalException e)
         {
             JMSSelectorFilter._logger.warn("Caght exception when evaluating message selector
for message  " + message, e);
         }

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java?rev=979294&r1=979293&r2=979294&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
(original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
Mon Jul 26 14:09:55 2010
@@ -17,7 +17,7 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
@@ -32,7 +32,7 @@ public abstract class LogicExpression ex
         return new LogicExpression(lvalue, rvalue)
             {
 
-                public Object evaluate(AbstractJMSMessage message) throws QpidException
+                public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
                 {
 
                     Boolean lv = (Boolean) left.evaluate(message);
@@ -59,7 +59,7 @@ public abstract class LogicExpression ex
         return new LogicExpression(lvalue, rvalue)
             {
 
-                public Object evaluate(AbstractJMSMessage message) throws QpidException
+                public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
                 {
 
                     Boolean lv = (Boolean) left.evaluate(message);
@@ -96,9 +96,9 @@ public abstract class LogicExpression ex
         super(left, right);
     }
 
-    public abstract Object evaluate(AbstractJMSMessage message) throws QpidException;
+    public abstract Object evaluate(AbstractJMSMessage message) throws AMQInternalException;
 
-    public boolean matches(AbstractJMSMessage message) throws QpidException
+    public boolean matches(AbstractJMSMessage message) throws AMQInternalException
     {
         Object object = evaluate(message);
 

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java?rev=979294&r1=979293&r2=979294&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java Mon
Jul 26 14:09:55 2010
@@ -17,11 +17,11 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
 public interface MessageFilter
 {
-    boolean matches(AbstractJMSMessage message) throws QpidException;
+    boolean matches(AbstractJMSMessage message) throws AMQInternalException;
 }

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java?rev=979294&r1=979293&r2=979294&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
(original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
Mon Jul 26 14:09:55 2010
@@ -17,14 +17,14 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.client.message.AbstractJMSMessage;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.ErrorCode;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
+import java.util.HashMap;
 
 import javax.jms.JMSException;
-import java.util.HashMap;
+
+import org.apache.qpid.AMQInternalException;
+import org.apache.qpid.client.message.AbstractJMSMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Represents a property  expression
@@ -234,7 +234,7 @@ public class PropertyExpression implemen
         jmsPropertyExpression = JMS_PROPERTY_EXPRESSIONS.get(name);
     }
 
-    public Object evaluate(AbstractJMSMessage message) throws QpidException
+    public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
     {
 
         if (jmsPropertyExpression != null)
@@ -256,7 +256,7 @@ public class PropertyExpression implemen
             }
             catch(JMSException e)
             {
-                throw new QpidException("Exception evaluating properties for filter", ErrorCode.INTERNAL_ERROR,
e);
+                throw new AMQInternalException("Exception evaluating properties for filter",
e);
             }
         }
     }

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java?rev=979294&r1=979293&r2=979294&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
(original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
Mon Jul 26 14:09:55 2010
@@ -17,14 +17,14 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
-import org.apache.qpid.client.message.AbstractJMSMessage;
-
 import java.math.BigDecimal;
-import java.util.List;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
+
+import org.apache.qpid.AMQInternalException;
+import org.apache.qpid.client.message.AbstractJMSMessage;
 
 /**
  * An expression which performs an operation on two expression values
@@ -39,7 +39,7 @@ public abstract class UnaryExpression im
     {
         return new UnaryExpression(left)
         {
-            public Object evaluate(AbstractJMSMessage message) throws QpidException
+            public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
             {
                 Object rvalue = right.evaluate(message);
                 if (rvalue == null)
@@ -84,7 +84,7 @@ public abstract class UnaryExpression im
 
         return new BooleanUnaryExpression(right)
         {
-            public Object evaluate(AbstractJMSMessage message) throws QpidException
+            public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
             {
 
                 Object rvalue = right.evaluate(message);
@@ -156,7 +156,7 @@ public abstract class UnaryExpression im
             super(left);
         }
 
-        public boolean matches(AbstractJMSMessage message) throws QpidException
+        public boolean matches(AbstractJMSMessage message) throws AMQInternalException
         {
             Object object = evaluate(message);
 
@@ -170,7 +170,7 @@ public abstract class UnaryExpression im
     {
         return new BooleanUnaryExpression(left)
         {
-            public Object evaluate(AbstractJMSMessage message) throws QpidException
+            public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
             {
                 Boolean lvalue = (Boolean) right.evaluate(message);
                 if (lvalue == null)
@@ -191,7 +191,7 @@ public abstract class UnaryExpression im
     {
         return new BooleanUnaryExpression(left)
         {
-            public Object evaluate(AbstractJMSMessage message) throws QpidException
+            public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
             {
                 Object rvalue = right.evaluate(message);
                 if (rvalue == null)

Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java?rev=979294&r1=979293&r2=979294&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java Mon Jul 26
14:09:55 2010
@@ -19,7 +19,7 @@ package org.apache.qpid.dtx;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInvalidArgumentException;
 
 import javax.transaction.xa.Xid;
 
@@ -107,9 +107,9 @@ public class XidImpl implements Xid
      * Note - The sum of the two lengths must equal the length of the data field.
      *
      * @param xid an XID STring Form
-     * @throws QpidException If the string does not represent a valid Xid
+     * @throws AMQInvalidArgumentException If the string does not represent a valid Xid
      */
-    public XidImpl(String xid) throws QpidException
+    public XidImpl(String xid) throws AMQInvalidArgumentException
     {
         if (_logger.isDebugEnabled())
         {
@@ -125,16 +125,16 @@ public class XidImpl implements Xid
             _branchQualifier = new byte[b];
             if (input.read(_globalTransactionID, 0, g) != g)
             {
-                throw new QpidException("Cannot convert the string " + xid + " into an Xid",
null, null);
+                throw new AMQInvalidArgumentException("Cannot convert the string " + xid
+ " into an Xid", null);
             }
             if (input.read(_branchQualifier, 0, b) != b)
             {
-                throw new QpidException("Cannot convert the string " + xid + " into an Xid",
null, null);
+                throw new AMQInvalidArgumentException("Cannot convert the string " + xid
+ " into an Xid", null);
             }
         }
         catch (IOException e)
         {
-            throw new QpidException("cannot convert the string " + xid + " into an Xid",
null, e);
+            throw new AMQInvalidArgumentException("cannot convert the string " + xid + "
into an Xid", e);
         }
     }
 
@@ -239,9 +239,8 @@ public class XidImpl implements Xid
      *
      * @param xid an Xid to convert.
      * @return The String representation of this Xid
-     * @throws QpidException In case of problem when converting this Xid into a string.
      */
-    public static org.apache.qpid.transport.Xid convert(Xid xid) throws QpidException
+    public static org.apache.qpid.transport.Xid convert(Xid xid)
     {
         return new org.apache.qpid.transport.Xid(xid.getFormatId(),
                                                     xid.getGlobalTransactionId(),

Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java?rev=979294&r1=979293&r2=979294&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
(original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
Mon Jul 26 14:09:55 2010
@@ -26,8 +26,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.qpid.QpidException;
-
 import javax.security.sasl.Sasl;
 import javax.security.sasl.SaslException;
 import javax.security.sasl.SaslServer;

Modified: qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/ManagementClient.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/ManagementClient.java?rev=979294&r1=979293&r2=979294&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/ManagementClient.java
(original)
+++ qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/ManagementClient.java
Mon Jul 26 14:09:55 2010
@@ -22,7 +22,6 @@ package org.apache.qpid.management.domai
 
 import java.util.UUID;
 
-import org.apache.qpid.QpidException;
 import org.apache.qpid.management.Messages;
 import org.apache.qpid.management.Names;
 import org.apache.qpid.management.configuration.BrokerConnectionData;
@@ -152,7 +151,7 @@ public final class ManagementClient
     /**
      * Registers a consumer (listener) on the management queue.
      */
-    private void registerConsumerOnManagementQueue () throws QpidException
+    private void registerConsumerOnManagementQueue ()
     {  
         BrokerMessageListener managementChannelListener = new BrokerMessageListener(_domainModel);
         managementChannelListener.setHandlers(Configuration.getInstance().getManagementQueueHandlers());
       

Modified: qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QpidService.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QpidService.java?rev=979294&r1=979293&r2=979294&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QpidService.java
(original)
+++ qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QpidService.java
Mon Jul 26 14:09:55 2010
@@ -25,7 +25,6 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.qpid.QpidException;
 import org.apache.qpid.api.Message;
 import org.apache.qpid.management.Messages;
 import org.apache.qpid.management.Names;



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message