Merge "BUG-730 : added tests for Encoders/Decoders in PCEP."

[bgpcep.git] / pcep / spi / src / main / java / org / opendaylight / protocol / pcep / spi / pojo / SimpleObjectRegistry.java

diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleObjectRegistry.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleObjectRegistry.java
index d624f10e2f1be612d96a0cc731587328c40a2687..b5950f0be6a8888d14e4282c3c2431fe31ebe9de 100644 (file)
--- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleObjectRegistry.java
+++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleObjectRegistry.java
@@ -53,15 +53,13 @@ public final class SimpleObjectRegistry implements ObjectRegistry {
                        return null;
                    }
 
-                       final boolean foundClass = false;
-
-                       // FIXME: BUG-187: search the parsers, check classes
-
-                       if (!foundClass) {
-                               return new UnknownObject(PCEPErrors.UNRECOGNIZED_OBJ_CLASS);
-                       } else {
-                               return new UnknownObject(PCEPErrors.UNRECOGNIZED_OBJ_TYPE);
+                       for (int type = 1; type <= 15; type++) {
+                           final ObjectParser objParser = this.handlers.getParser(createKey(objectClass, type));
+                           if(objParser != null) {
+                               return new UnknownObject(PCEPErrors.UNRECOGNIZED_OBJ_TYPE);
+                           }
                        }
+                       return new UnknownObject(PCEPErrors.UNRECOGNIZED_OBJ_CLASS);
                }
                return parser.parseObject(header, buffer);
        }