X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pcep%2Fimpl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fprotocol%2Fpcep%2Fimpl%2FPCEPSessionImpl.java;h=db5c8b50b8f6417a9bcca86a788601a1da86a05f;hb=1f18c032706004ce9bf0fcc648090ec5211b945a;hp=1a415e0f2e96d686d44f9ff183c55e28b286f741;hpb=e223e0dd2ed82110c2cf1e9c25ac8019adf6dfca;p=bgpcep.git diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImpl.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImpl.java index 1a415e0f2e..db5c8b50b8 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImpl.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImpl.java @@ -34,22 +34,22 @@ import org.opendaylight.protocol.pcep.PCEPSessionListener; import org.opendaylight.protocol.pcep.TerminationReason; import org.opendaylight.protocol.pcep.impl.spi.Util; import org.opendaylight.protocol.pcep.spi.PCEPErrors; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.CloseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.Keepalive; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.KeepaliveBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev181109.CloseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev181109.Keepalive; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev181109.KeepaliveBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stats.rev171113.pcep.session.state.LocalPref; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stats.rev171113.pcep.session.state.Messages; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stats.rev171113.pcep.session.state.PeerPref; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.CloseMessage; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.KeepaliveMessage; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Message; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.OpenMessage; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.PcerrMessage; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.close.message.CCloseMessageBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.close.object.CCloseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.keepalive.message.KeepaliveMessageBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.object.Open; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.object.open.Tlvs; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.CloseMessage; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.KeepaliveMessage; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.Message; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.OpenMessage; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.PcerrMessage; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.close.message.CCloseMessageBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.close.object.CCloseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.keepalive.message.KeepaliveMessageBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.Open; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.open.Tlvs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -90,7 +90,7 @@ public class PCEPSessionImpl extends SimpleChannelInboundHandler implem // True if the listener should not be notified about events @GuardedBy("this") - private AtomicBoolean closed = new AtomicBoolean(false); + private final AtomicBoolean closed = new AtomicBoolean(false); private final Channel channel; @@ -237,7 +237,7 @@ public class PCEPSessionImpl extends SimpleChannelInboundHandler implem * inside the session or from the listener, therefore the parent of this session should be informed. */ @Override - public synchronized void close(final TerminationReason reason) { + public void close(final TerminationReason reason) { if (this.closed.getAndSet(true)) { LOG.debug("Session is already closed."); return; @@ -301,13 +301,13 @@ public class PCEPSessionImpl extends SimpleChannelInboundHandler implem * @param error documented error in RFC5440 or draft */ @VisibleForTesting - public void handleMalformedMessage(final PCEPErrors error) { + void handleMalformedMessage(final PCEPErrors error) { final long ct = TICKER.read(); this.sendErrorMessage(error); if (error == PCEPErrors.CAPABILITY_NOT_SUPPORTED) { this.unknownMessagesTimes.add(ct); while (ct - this.unknownMessagesTimes.peek() > MINUTE) { - this.unknownMessagesTimes.poll(); + final Long poll = this.unknownMessagesTimes.poll(); } if (this.unknownMessagesTimes.size() > this.maxUnknownMessages) { this.terminate(TerminationReason.TOO_MANY_UNKNOWN_MSGS); @@ -403,9 +403,9 @@ public class PCEPSessionImpl extends SimpleChannelInboundHandler implem } @Override - public final void channelInactive(final ChannelHandlerContext ctx) { + public synchronized final void channelInactive(final ChannelHandlerContext ctx) { LOG.debug("Channel {} inactive.", ctx.channel()); - this.endOfInput(); + endOfInput(); try { super.channelInactive(ctx); @@ -415,23 +415,23 @@ public class PCEPSessionImpl extends SimpleChannelInboundHandler implem } @Override - protected final void channelRead0(final ChannelHandlerContext ctx, final Message msg) { + protected synchronized final void channelRead0(final ChannelHandlerContext ctx, final Message msg) { LOG.debug("Message was received: {}", msg); - this.handleMessage(msg); + handleMessage(msg); } @Override - public final void handlerAdded(final ChannelHandlerContext ctx) { + public synchronized final void handlerAdded(final ChannelHandlerContext ctx) { this.sessionUp(); } @Override - public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable cause) { + public synchronized void exceptionCaught(final ChannelHandlerContext ctx, final Throwable cause) { handleException(cause); } @Override - public Tlvs localSessionCharacteristics() { + public Tlvs getLocalTlvs() { return this.localOpen.getTlvs(); }