Merge changes Ieaa9ede2,I18c02205

* changes:
  Make container fail when bundles are unresolved
  Fix test dependencies to reflect BGP refactor

diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/StatefulActivator.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/StatefulActivator.java
index b4f5ec3629f41f541d75b96ef2e2a17c82eee41c..85d78b075c22cb83b9aebdc03faa4bfc7880d930 100644 (file)
--- a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/StatefulActivator.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/StatefulActivator.java
@@ -44,11 +44,11 @@ public class StatefulActivator extends AbstractPCEPExtensionProviderActivator {
                                new PCEPRequestMessageParser(context.getObjectHandlerRegistry())));
                regs.add(context.registerMessageSerializer(Pcreq.class, new PCEPRequestMessageParser(context.getObjectHandlerRegistry())));
 
-               regs.add(context.registerObjectParser(PCEPLspObjectParser.TYPE, PCEPLspObjectParser.CLASS,
+               regs.add(context.registerObjectParser(PCEPLspObjectParser.CLASS, PCEPLspObjectParser.TYPE,
                                new PCEPLspObjectParser(context.getTlvHandlerRegistry())));
                regs.add(context.registerObjectSerializer(Lsp.class, new PCEPLspObjectParser(context.getTlvHandlerRegistry())));
 
-               regs.add(context.registerObjectParser(PCEPOpenObjectParser.TYPE, PCEPOpenObjectParser.CLASS,
+               regs.add(context.registerObjectParser(PCEPOpenObjectParser.CLASS, PCEPOpenObjectParser.TYPE,
                                new PCEPOpenObjectParser(context.getTlvHandlerRegistry())));
                regs.add(context.registerObjectSerializer(Open.class, new PCEPOpenObjectParser(context.getTlvHandlerRegistry())));
 

diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleObjectHandlerRegistry.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleObjectHandlerRegistry.java
index 5fbb0e8262567bbb474fa500e7b1406470095592..c93b9374c2c8faef763cee3108fc5c64b8872d1d 100644 (file)
--- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleObjectHandlerRegistry.java
+++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleObjectHandlerRegistry.java
@@ -33,8 +33,8 @@ public final class SimpleObjectHandlerRegistry implements ObjectHandlerRegistry
        }
 
        public AutoCloseable registerObjectParser(final int objectClass, final int objectType, final ObjectParser parser) {
-               Preconditions.checkArgument(objectClass >= 0 && objectClass <= Values.UNSIGNED_BYTE_MAX_VALUE);
-               Preconditions.checkArgument(objectType >= 0 && objectType <= 15);
+               Preconditions.checkArgument(objectClass >= 0 && objectClass <= Values.UNSIGNED_BYTE_MAX_VALUE, "Illagal object class %s", objectClass);
+               Preconditions.checkArgument(objectType >= 0 && objectType <= 15, "Illegal object type %s", objectType);
                return this.handlers.registerParser(createKey(objectClass, objectType), parser);
        }