Report ErrorType.APPLICATION from codecs

[yangtools.git] / data / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / codec / AbstractIntegerStringCodec.java

diff --git a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/AbstractIntegerStringCodec.java b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/AbstractIntegerStringCodec.java
index 28df15b1acb449916eba405ea76c4778b7a9b76a..ac69cab0cf8a15bcc09fc81418607eacce15af05 100644 (file)
--- a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/AbstractIntegerStringCodec.java
+++ b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/AbstractIntegerStringCodec.java
@@ -99,7 +99,7 @@ public abstract class AbstractIntegerStringCodec<N extends Number & Comparable<N
         if (rangeConstraint != null) {
             final RangeSet<N> ranges = rangeConstraint.getAllowedRanges();
             if (!ranges.contains(deserialized)) {
-                throw new YangInvalidValueException(ErrorType.PROTOCOL, rangeConstraint,
+                throw new YangInvalidValueException(ErrorType.APPLICATION, rangeConstraint,
                     "Value '" + deserialized + "'  is not in required ranges " + ranges);
             }
         }
@@ -127,9 +127,7 @@ public abstract class AbstractIntegerStringCodec<N extends Number & Comparable<N
     }
 
     private static int provideBase(final String integer) {
-        if (integer.length() == 1 && integer.charAt(0) == '0') {
-            return 10;
-        } else if (INT_PATTERN.matcher(integer).matches()) {
+        if ((integer.length() == 1 && integer.charAt(0) == '0') || INT_PATTERN.matcher(integer).matches()) {
             return 10;
         } else if (HEX_PATTERN.matcher(integer).matches()) {
             return 16;