qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject svn commit: r1670933 - in /qpid/trunk/qpid/java/broker-plugins: amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java
Date Thu, 02 Apr 2015 16:30:07 GMT
Author: orudyy
Date: Thu Apr  2 16:30:07 2015
New Revision: 1670933

URL: http://svn.apache.org/r1670933
Log:
QPID-6469: Remove not used method sendResponseAndCloseSender from AMQProtocolEngine.
           Remove exception handling code from ProtocolEngine_1_0_0_SASL as it is not used
by new i/o layer

Modified:
    qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
    qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java?rev=1670933&r1=1670932&r2=1670933&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
(original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
Thu Apr  2 16:30:07 2015
@@ -1161,35 +1161,6 @@ public class AMQProtocolEngine implement
         // noop - exception method is not used by new i/o layer
     }
 
-    private void sendResponseAndCloseSender(AMQDataBlock dataBlock)
-    {
-        try
-        {
-            writeFrame(dataBlock);
-        }
-        catch(SenderException e)
-        {
-            if (_logger.isDebugEnabled())
-            {
-                _logger.debug("Exception occurred on sending response", e);
-            }
-        }
-        finally
-        {
-            try
-            {
-                _sender.close();
-            }
-            catch(SenderException e)
-            {
-                if (_logger.isDebugEnabled())
-                {
-                    _logger.debug("Exception occurred on sender close", e);
-                }
-            }
-        }
-    }
-
     public long getReadBytes()
     {
         return _readBytes;

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java?rev=1670933&r1=1670932&r2=1670933&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java
(original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java
Thu Apr  2 16:30:07 2015
@@ -20,7 +20,6 @@
  */
 package org.apache.qpid.server.protocol.v1_0;
 
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.net.SocketAddress;
 import java.nio.ByteBuffer;
@@ -51,8 +50,6 @@ import org.apache.qpid.amqp_1_0.transpor
 import org.apache.qpid.amqp_1_0.type.Binary;
 import org.apache.qpid.amqp_1_0.type.FrameBody;
 import org.apache.qpid.amqp_1_0.type.Symbol;
-import org.apache.qpid.amqp_1_0.type.transport.AmqpError;
-import org.apache.qpid.amqp_1_0.type.transport.Error;
 import org.apache.qpid.common.QpidProperties;
 import org.apache.qpid.common.ServerPropertyNames;
 import org.apache.qpid.server.protocol.ServerProtocolEngine;
@@ -65,14 +62,11 @@ import org.apache.qpid.server.protocol.A
 import org.apache.qpid.server.security.SubjectCreator;
 import org.apache.qpid.server.security.auth.UsernamePrincipal;
 import org.apache.qpid.server.util.Action;
-import org.apache.qpid.server.util.ServerScopedRuntimeException;
 import org.apache.qpid.transport.ByteBufferSender;
-import org.apache.qpid.transport.TransportException;
 import org.apache.qpid.transport.network.NetworkConnection;
 
 public class ProtocolEngine_1_0_0_SASL implements ServerProtocolEngine, FrameOutputHandler
 {
-    private static final Logger _logger = LoggerFactory.getLogger(ProtocolEngine_1_0_0_SASL.class);
 
     private final AmqpPort<?> _port;
     private final Transport _transport;
@@ -449,37 +443,7 @@ public class ProtocolEngine_1_0_0_SASL i
 
     public void exception(Throwable throwable)
     {
-        if (throwable instanceof IOException)
-        {
-            _logger.info("IOException caught in " + this + ", connection closed implicitly:
" + throwable);
-        }
-        else
-        {
-
-            try
-            {
-                final Error err = new Error();
-                err.setCondition(AmqpError.INTERNAL_ERROR);
-                err.setDescription(throwable.getMessage());
-                _endpoint.close(err);
-                close();
-            }
-            catch(TransportException e)
-            {
-                _logger.info("Error when handling exception",e);
-            }
-            finally
-            {
-                if(throwable instanceof java.lang.Error)
-                {
-                    throw (java.lang.Error) throwable;
-                }
-                if(throwable instanceof ServerScopedRuntimeException)
-                {
-                    throw (ServerScopedRuntimeException) throwable;
-                }
-            }
-        }
+        // noop - exception method is not used by new i/o layer
     }
 
     public void closed()



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message