qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject svn commit: r1481012 - in /qpid/proton/trunk: proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/ proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/ proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/
Date Fri, 10 May 2013 14:02:24 GMT
Author: kwall
Date: Fri May 10 14:02:24 2013
New Revision: 1481012

URL: http://svn.apache.org/r1481012
Log:
PROTON-307: removed redundant input and output methods from Sasl interface.

Modified:
    qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISasl.java
    qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Sasl.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java

Modified: qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISasl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISasl.java?rev=1481012&r1=1481011&r2=1481012&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISasl.java
(original)
+++ qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISasl.java
Fri May 10 14:02:24 2013
@@ -42,18 +42,6 @@ public class JNISasl implements Sasl
     }
 
     @Override
-    public int input(byte[] bytes, int offset, int size)
-    {
-        return 0;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public int output(byte[] bytes, int offset, int size)
-    {
-        return 0;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
     @ProtonCEquivalent("pn_sasl_state")
     public SaslState getState()
     {

Modified: qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Sasl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Sasl.java?rev=1481012&r1=1481011&r2=1481012&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Sasl.java
(original)
+++ qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Sasl.java
Fri May 10 14:02:24 2013
@@ -64,23 +64,6 @@ public interface Sasl
     public static SaslOutcome PN_SASL_TEMP = SaslOutcome.PN_SASL_TEMP;
 
     public int END_OF_STREAM = -1;
-    /**
-     * @param bytes input bytes for consumption
-     * @param offset the offset within bytes where input begins
-     * @param size the number of bytes available for input
-     *
-     * @return the number of bytes consumed
-     */
-    public int input(byte[] bytes, int offset, int size);
-
-    /**
-     * @param bytes array for output bytes
-     * @param offset the offset within bytes where output begins
-     * @param size the number of bytes available for output
-     *
-     * @return the number of bytes written
-     */
-    public int output(byte[] bytes, int offset, int size);
 
     /** Access the current state of the layer.
      *

Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java?rev=1481012&r1=1481011&r2=1481012&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
(original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
Fri May 10 14:02:24 2013
@@ -87,7 +87,7 @@ public class SaslImpl implements Sasl, S
         return _done && (_role==Role.CLIENT || _initReceived);
     }
 
-    public final int input(byte[] bytes, int offset, int size)
+    private final int input(byte[] bytes, int offset, int size)
     {
         if(isDone())
         {
@@ -99,7 +99,7 @@ public class SaslImpl implements Sasl, S
         }
     }
 
-    public final int output(byte[] bytes, int offset, int size)
+    private final int output(byte[] bytes, int offset, int size)
     {
 
         int written = 0;



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


Mime
View raw message