You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ra...@apache.org on 2012/09/13 22:15:41 UTC
svn commit: r1384504 - in
/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl:
ConnectionImpl.java EndpointImpl.java TransportImpl.java
Author: rajith
Date: Thu Sep 13 20:15:41 2012
New Revision: 1384504
URL: http://svn.apache.org/viewvc?rev=1384504&view=rev
Log:
PROTON-15 Removed the duplicate _next/_prev fields and their
accessors/modifiers as they seem extra bcos we have
_transportNext/_transportPrev.
Modified:
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImpl.java
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
Modified: qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java?rev=1384504&r1=1384503&r2=1384504&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java (original)
+++ qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java Thu Sep 13 20:15:41 2012
@@ -274,11 +274,6 @@ public class ConnectionImpl extends Endp
return _maxChannels;
}
- public EndpointImpl next()
- {
- return getNext();
- }
-
public String getLocalContainerId()
{
return _localContainerId;
Modified: qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImpl.java?rev=1384504&r1=1384503&r2=1384504&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImpl.java (original)
+++ qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImpl.java Thu Sep 13 20:15:41 2012
@@ -32,8 +32,6 @@ public abstract class EndpointImpl imple
private EndpointError _localError;
private EndpointError _remoteError;
private boolean _modified;
- private EndpointImpl _next;
- private EndpointImpl _prev;
private EndpointImpl _transportNext;
private EndpointImpl _transportPrev;
@@ -141,26 +139,15 @@ public abstract class EndpointImpl imple
return _transportPrev;
}
- void setNext(EndpointImpl next)
- {
- _next = next;
- }
-
- void setPrev(EndpointImpl prev)
- {
- _prev = prev;
- }
-
-
public void free()
{
- if(_next != null)
+ if(_transportNext != null)
{
- _next._prev = _prev;
+ _transportNext.setTransportPrev(_transportPrev);
}
- if(_prev != null)
+ if(_transportPrev != null)
{
- _prev._next = _next;
+ _transportPrev.setTransportNext(_transportNext);
}
}
@@ -173,17 +160,4 @@ public abstract class EndpointImpl imple
{
_transportPrev = transportPrevious;
}
-
- EndpointImpl getPrev()
- {
- return _prev;
- }
-
- EndpointImpl getNext()
- {
- return _next;
- }
-
-
-
}
Modified: qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java?rev=1384504&r1=1384503&r2=1384504&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java (original)
+++ qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java Thu Sep 13 20:15:41 2012
@@ -210,7 +210,7 @@ public class TransportImpl extends Endpo
}
}
- endpoint = endpoint.getNext();
+ endpoint = endpoint.transportNext();
}
return written;
}
@@ -252,7 +252,7 @@ public class TransportImpl extends Endpo
}
- endpoint = endpoint.getNext();
+ endpoint = endpoint.transportNext();
}
return written; //TODO - Implement
}
@@ -475,7 +475,7 @@ public class TransportImpl extends Endpo
}
}
}
- endpoint = endpoint.getNext();
+ endpoint = endpoint.transportNext();
}
return written;
}
@@ -677,7 +677,7 @@ public class TransportImpl extends Endpo
}
}
- endpoint = endpoint.getNext();
+ endpoint = endpoint.transportNext();
}
return written;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org