You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2018/06/15 21:17:37 UTC
[directory-server] branch master updated: Fixed some error messages
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git
The following commit(s) were added to refs/heads/master by this push:
new 030791a Fixed some error messages
030791a is described below
commit 030791ac9b2a834ddda589ad96bfd6e8c1c81b90
Author: Emmanuel Lécharny <el...@symas.com>
AuthorDate: Fri Jun 15 23:17:35 2018 +0200
Fixed some error messages
---
.../org/apache/directory/server/i18n/errors.properties | 2 +-
.../codec/EncKdcRepPart/actions/EncKdcRepPartInit.java | 4 ++--
.../kerberos/codec/EncKdcRepPart/actions/StoreLastReq.java | 4 ++--
.../kerberos/codec/actions/AbstractReadAuthorizationData.java | 4 ++--
.../shared/kerberos/codec/actions/AbstractReadCheckSum.java | 4 ++--
.../kerberos/codec/actions/AbstractReadEncryptedPart.java | 4 ++--
.../kerberos/codec/actions/AbstractReadEncryptionKey.java | 4 ++--
.../shared/kerberos/codec/actions/AbstractReadHostAddress.java | 4 ++--
.../kerberos/codec/actions/AbstractReadHostAddresses.java | 4 ++--
.../kerberos/codec/actions/AbstractReadKerberosTime.java | 8 ++++----
.../shared/kerberos/codec/actions/AbstractReadMsgType.java | 10 +++++-----
.../kerberos/codec/actions/AbstractReadPrincipalName.java | 4 ++--
.../shared/kerberos/codec/actions/AbstractReadPvno.java | 10 ++++------
.../shared/kerberos/codec/actions/AbstractReadRealm.java | 4 ++--
.../shared/kerberos/codec/adAndOr/actions/AdAndOrInit.java | 4 ++--
.../kerberos/codec/adKdcIssued/actions/AdKdcIssuedInit.java | 4 ++--
.../shared/kerberos/codec/apRep/actions/ApRepInit.java | 4 ++--
.../shared/kerberos/codec/apReq/actions/ApReqInit.java | 4 ++--
.../shared/kerberos/codec/apReq/actions/StoreApOptions.java | 4 ++--
.../shared/kerberos/codec/apReq/actions/StoreTicket.java | 4 ++--
.../shared/kerberos/codec/asRep/actions/StoreKdcRep.java | 4 ++--
.../shared/kerberos/codec/asReq/actions/StoreKdcReq.java | 4 ++--
.../codec/authenticator/actions/AuthenticatorInit.java | 4 ++--
.../shared/kerberos/codec/checksum/actions/ChecksumInit.java | 4 ++--
.../shared/kerberos/codec/checksum/actions/StoreCksumType.java | 7 +++----
.../kerberos/codec/encApRepPart/actions/EncApRepPartInit.java | 4 ++--
.../kerberos/codec/encAsRepPart/actions/StoreEncAsRepPart.java | 4 ++--
.../codec/encKrbCredPart/actions/EncKrbCredPartInit.java | 4 ++--
.../kerberos/codec/encKrbCredPart/actions/StoreTicketInfo.java | 4 ++--
.../codec/encKrbPrivPart/actions/EncKrbPrivPartInit.java | 4 ++--
.../codec/encTgsRepPart/actions/StoreEncTgsRepPart.java | 4 ++--
.../codec/encTicketPart/actions/EncTicketPartInit.java | 4 ++--
.../kerberos/codec/encTicketPart/actions/StoreTransited.java | 4 ++--
.../kerberos/codec/etypeInfo/actions/AddETypeInfoEntry.java | 4 ++--
.../kerberos/codec/etypeInfo2/actions/AddETypeInfo2Entry.java | 4 ++--
.../codec/etypeInfo2Entry/actions/ETypeInfo2EntryInit.java | 4 ++--
.../kerberos/codec/etypeInfo2Entry/actions/StoreEType.java | 7 +++----
.../codec/etypeInfoEntry/actions/ETypeInfoEntryInit.java | 4 ++--
.../kerberos/codec/etypeInfoEntry/actions/StoreEType.java | 7 +++----
.../kerberos/codec/hostAddresses/actions/AddHostAddress.java | 4 ++--
.../shared/kerberos/codec/kdcRep/actions/AddPaData.java | 4 ++--
.../shared/kerberos/codec/kdcRep/actions/StoreTicket.java | 4 ++--
.../shared/kerberos/codec/kdcReq/actions/AddPaData.java | 4 ++--
.../shared/kerberos/codec/kdcReq/actions/StoreKdcReqBody.java | 4 ++--
.../shared/kerberos/codec/kdcReqBody/actions/AddEType.java | 7 +++----
.../shared/kerberos/codec/kdcReqBody/actions/AddTicket.java | 4 ++--
.../kerberos/codec/kdcReqBody/actions/KdcReqBodyInit.java | 4 ++--
.../shared/kerberos/codec/kdcReqBody/actions/StoreFrom.java | 8 ++++----
.../kerberos/codec/kdcReqBody/actions/StoreKdcOptions.java | 4 ++--
.../shared/kerberos/codec/kdcReqBody/actions/StoreTill.java | 8 ++++----
.../shared/kerberos/codec/krbCred/actions/KrbCredInit.java | 4 ++--
.../shared/kerberos/codec/krbCred/actions/StoreTickets.java | 4 ++--
.../kerberos/codec/krbCredInfo/actions/KrbCredInfoInit.java | 4 ++--
.../shared/kerberos/codec/krbError/actions/KrbErrorInit.java | 4 ++--
.../shared/kerberos/codec/krbError/actions/StoreEText.java | 4 ++--
.../shared/kerberos/codec/krbPriv/actions/KrbPrivInit.java | 4 ++--
.../shared/kerberos/codec/krbSafe/actions/KrbSafeInit.java | 4 ++--
.../shared/kerberos/codec/krbSafe/actions/StoreSafeBody.java | 4 ++--
.../kerberos/codec/krbSafeBody/actions/KrbSafeBodyInit.java | 4 ++--
.../shared/kerberos/codec/lastReq/actions/LastReqInit.java | 4 ++--
.../shared/kerberos/codec/methodData/actions/AddPaData.java | 4 ++--
.../kerberos/codec/paEncTsEnc/actions/PaEncTsEncInit.java | 4 ++--
.../shared/kerberos/codec/padata/actions/StoreDataType.java | 7 +++----
.../shared/kerberos/codec/tgsRep/actions/StoreKdcRep.java | 4 ++--
.../shared/kerberos/codec/tgsReq/actions/StoreKdcReq.java | 4 ++--
.../codec/transitedEncoding/actions/TransitedEncodingInit.java | 4 ++--
.../shared/kerberos/codec/typedData/actions/TypedDataInit.java | 4 ++--
67 files changed, 149 insertions(+), 156 deletions(-)
diff --git a/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties b/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
index ca9eca9..1f96c7e 100644
--- a/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
+++ b/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
@@ -771,4 +771,4 @@ ERR_746=Not a valid log file number {0}
ERR_747=Not a valid log file offset {0}
ERR_748=Invalid log file bufferSize/ max size is sepcified bufferSize {0} logFileSize {0}
ERR_749=Log Scanner is already closed
-ERR_750=Log content is invalid
\ No newline at end of file
+ERR_750=Log content is invalid
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/actions/EncKdcRepPartInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/actions/EncKdcRepPartInit.java
index 53a2d56..eafe95d 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/actions/EncKdcRepPartInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/actions/EncKdcRepPartInit.java
@@ -63,10 +63,10 @@ public class EncKdcRepPartInit extends GrammarAction<EncKdcRepPartContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
EncKdcRepPart encKdcRepPart = new EncKdcRepPart();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/actions/StoreLastReq.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/actions/StoreLastReq.java
index a2f6a08..d958ccd 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/actions/StoreLastReq.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/actions/StoreLastReq.java
@@ -65,10 +65,10 @@ public class StoreLastReq extends GrammarAction<EncKdcRepPartContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the LastReq
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadAuthorizationData.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadAuthorizationData.java
index 17286bc..abf9d03 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadAuthorizationData.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadAuthorizationData.java
@@ -74,10 +74,10 @@ public abstract class AbstractReadAuthorizationData<E extends Asn1Container> ext
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the AuthorizationData
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadCheckSum.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadCheckSum.java
index 95d2b08..cb8e030 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadCheckSum.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadCheckSum.java
@@ -74,10 +74,10 @@ public abstract class AbstractReadCheckSum<E extends Asn1Container> extends Gram
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the Checksum
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadEncryptedPart.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadEncryptedPart.java
index cc59819..9f4ac3c 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadEncryptedPart.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadEncryptedPart.java
@@ -75,10 +75,10 @@ public abstract class AbstractReadEncryptedPart<E extends Asn1Container> extends
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the PrincipalName
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadEncryptionKey.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadEncryptionKey.java
index 3385d4c..6face99 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadEncryptionKey.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadEncryptionKey.java
@@ -74,10 +74,10 @@ public abstract class AbstractReadEncryptionKey<E extends Asn1Container> extends
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the EncryptionKey
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadHostAddress.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadHostAddress.java
index 1d0073d..a010c8c 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadHostAddress.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadHostAddress.java
@@ -68,10 +68,10 @@ public abstract class AbstractReadHostAddress<E extends Asn1Container> extends G
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the HostAddress
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadHostAddresses.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadHostAddresses.java
index a8bf661..9e091e9 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadHostAddresses.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadHostAddresses.java
@@ -74,10 +74,10 @@ public abstract class AbstractReadHostAddresses<E extends Asn1Container> extends
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the HostAddresses
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadKerberosTime.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadKerberosTime.java
index 85cd3fa..fb48a98 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadKerberosTime.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadKerberosTime.java
@@ -75,10 +75,10 @@ public abstract class AbstractReadKerberosTime<E extends Asn1Container> extends
// The Length should not be null and should be 15
if ( tlv.getLength() != 15 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// The value is the KerberosTime
@@ -98,10 +98,10 @@ public abstract class AbstractReadKerberosTime<E extends Asn1Container> extends
}
catch ( IllegalArgumentException iae )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
}
}
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadMsgType.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadMsgType.java
index 81eca7c..74087f6 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadMsgType.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadMsgType.java
@@ -79,10 +79,10 @@ public abstract class AbstractReadMsgType<E extends Asn1Container> extends Gramm
// The Length should not be null and should be 1
if ( tlv.getLength() != 1 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
BerValue value = tlv.getValue();
@@ -100,7 +100,7 @@ public abstract class AbstractReadMsgType<E extends Asn1Container> extends Gramm
return;
}
- String message = I18n.err( I18n.ERR_04070, Strings.dumpBytes( value.getData() ) );
+ String message = I18n.err( I18n.ERR_05102_INVALID_MESSAGE_ID, Strings.dumpBytes( value.getData() ) );
LOG.error( message );
// This will generate a PROTOCOL_ERROR
@@ -125,7 +125,7 @@ public abstract class AbstractReadMsgType<E extends Asn1Container> extends Gramm
}
}
- String message = I18n.err( I18n.ERR_04070, Strings.dumpBytes( value.getData() ) );
+ String message = I18n.err( I18n.ERR_05102_INVALID_MESSAGE_ID, Strings.dumpBytes( value.getData() ) );
LOG.error( message );
// This will generate a PROTOCOL_ERROR
@@ -134,7 +134,7 @@ public abstract class AbstractReadMsgType<E extends Asn1Container> extends Gramm
}
catch ( IntegerDecoderException ide )
{
- LOG.error( I18n.err( I18n.ERR_04070, Strings.dumpBytes( value.getData() ), ide
+ LOG.error( I18n.err( I18n.ERR_05102_INVALID_MESSAGE_ID, Strings.dumpBytes( value.getData() ), ide
.getLocalizedMessage() ) );
// This will generate a PROTOCOL_ERROR
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadPrincipalName.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadPrincipalName.java
index ddc488a..bb0ceff 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadPrincipalName.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadPrincipalName.java
@@ -74,10 +74,10 @@ public abstract class AbstractReadPrincipalName<E extends Asn1Container> extends
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the PrincipalName
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadPvno.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadPvno.java
index 3846269..48dd74b 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadPvno.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadPvno.java
@@ -28,7 +28,6 @@ import org.apache.directory.api.asn1.ber.tlv.IntegerDecoder;
import org.apache.directory.api.asn1.ber.tlv.IntegerDecoderException;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
-import org.apache.directory.api.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -77,10 +76,10 @@ public abstract class AbstractReadPvno<E extends Asn1Container> extends GrammarA
// The Length should not be null and should be 1
if ( tlv.getLength() != 1 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
BerValue value = tlv.getValue();
@@ -91,7 +90,7 @@ public abstract class AbstractReadPvno<E extends Asn1Container> extends GrammarA
if ( pvno != 5 )
{
- LOG.error( I18n.err( I18n.ERR_04070, Strings.dumpBytes( value.getData() ), "The PVNO should be 5" ) );
+ LOG.error( I18n.err( I18n.ERR_01306_VALUE_NOT_IN_RANGE, 5, 5 ) );
// This will generate a PROTOCOL_ERROR
throw new DecoderException( "The PVNO should be 5" );
@@ -106,8 +105,7 @@ public abstract class AbstractReadPvno<E extends Asn1Container> extends GrammarA
}
catch ( IntegerDecoderException ide )
{
- LOG.error( I18n.err( I18n.ERR_04070, Strings.dumpBytes( value.getData() ), ide
- .getLocalizedMessage() ) );
+ LOG.error( I18n.err( I18n.ERR_01306_VALUE_NOT_IN_RANGE, 5, 5 ) );
// This will generate a PROTOCOL_ERROR
throw new DecoderException( ide.getMessage() );
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadRealm.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadRealm.java
index 9f51d34..4828b49 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadRealm.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadRealm.java
@@ -73,10 +73,10 @@ public abstract class AbstractReadRealm<E extends Asn1Container> extends Grammar
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// The value is the realm
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adAndOr/actions/AdAndOrInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adAndOr/actions/AdAndOrInit.java
index 26ba470..132df50 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adAndOr/actions/AdAndOrInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adAndOr/actions/AdAndOrInit.java
@@ -63,10 +63,10 @@ public class AdAndOrInit extends GrammarAction<AdAndOrContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
AdAndOr adAndor = new AdAndOr();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adKdcIssued/actions/AdKdcIssuedInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adKdcIssued/actions/AdKdcIssuedInit.java
index 1420af8..53d0d67 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adKdcIssued/actions/AdKdcIssuedInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adKdcIssued/actions/AdKdcIssuedInit.java
@@ -63,10 +63,10 @@ public class AdKdcIssuedInit extends GrammarAction<AdKdcIssuedContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
AdKdcIssued adKdcIssued = new AdKdcIssued();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apRep/actions/ApRepInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apRep/actions/ApRepInit.java
index feb693e..d5d00d0 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apRep/actions/ApRepInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apRep/actions/ApRepInit.java
@@ -60,10 +60,10 @@ public class ApRepInit extends GrammarAction<ApRepContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Create the AP-REP now
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/actions/ApReqInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/actions/ApReqInit.java
index 54e69b1..b14ee82 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/actions/ApReqInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/actions/ApReqInit.java
@@ -60,10 +60,10 @@ public class ApReqInit extends GrammarAction<ApReqContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Create the AP-REQ now
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/actions/StoreApOptions.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/actions/StoreApOptions.java
index 450084f..a5cd41b 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/actions/StoreApOptions.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/actions/StoreApOptions.java
@@ -64,10 +64,10 @@ public class StoreApOptions extends GrammarAction<ApReqContainer>
// The Length should not be null, and should be 5
if ( tlv.getLength() != 5 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
ApReq apReq = apReqContainer.getApReq();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/actions/StoreTicket.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/actions/StoreTicket.java
index 1117716..0341f82 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/actions/StoreTicket.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/actions/StoreTicket.java
@@ -66,10 +66,10 @@ public class StoreTicket extends GrammarAction<ApReqContainer>
// The Length can't be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the Ticket
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asRep/actions/StoreKdcRep.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asRep/actions/StoreKdcRep.java
index 74612a9..c0d5d23 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asRep/actions/StoreKdcRep.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asRep/actions/StoreKdcRep.java
@@ -66,10 +66,10 @@ public class StoreKdcRep extends GrammarAction<AsRepContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the KDC-REP
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asReq/actions/StoreKdcReq.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asReq/actions/StoreKdcReq.java
index 54a2b2a..b7543e6 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asReq/actions/StoreKdcReq.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asReq/actions/StoreKdcReq.java
@@ -66,10 +66,10 @@ public class StoreKdcReq extends GrammarAction<AsReqContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the KDC-REQ
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/authenticator/actions/AuthenticatorInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/authenticator/actions/AuthenticatorInit.java
index 9ead824..d53e95e 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/authenticator/actions/AuthenticatorInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/authenticator/actions/AuthenticatorInit.java
@@ -63,10 +63,10 @@ public class AuthenticatorInit extends GrammarAction<AuthenticatorContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
Authenticator authenticator = new Authenticator();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/checksum/actions/ChecksumInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/checksum/actions/ChecksumInit.java
index 5651924..2466b9d 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/checksum/actions/ChecksumInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/checksum/actions/ChecksumInit.java
@@ -63,10 +63,10 @@ public class ChecksumInit extends GrammarAction<ChecksumContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
Checksum checksum = new Checksum();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/checksum/actions/StoreCksumType.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/checksum/actions/StoreCksumType.java
index fd67ceb..136c463 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/checksum/actions/StoreCksumType.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/checksum/actions/StoreCksumType.java
@@ -69,10 +69,10 @@ public class StoreCksumType extends GrammarAction<ChecksumContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
Checksum checksum = checksumContainer.getChecksum();
@@ -92,8 +92,7 @@ public class StoreCksumType extends GrammarAction<ChecksumContainer>
}
catch ( IntegerDecoderException ide )
{
- LOG.error( I18n.err( I18n.ERR_04070, Strings.dumpBytes( value.getData() ), ide
- .getLocalizedMessage() ) );
+ LOG.error( I18n.err( I18n.ERR_01310_INTEGER_DECODING_ERROR, Strings.dumpBytes( value.getData() ) ) );
// This will generate a PROTOCOL_ERROR
throw new DecoderException( ide.getMessage() );
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encApRepPart/actions/EncApRepPartInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encApRepPart/actions/EncApRepPartInit.java
index 94ca7c0..47a67d8 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encApRepPart/actions/EncApRepPartInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encApRepPart/actions/EncApRepPartInit.java
@@ -63,10 +63,10 @@ public class EncApRepPartInit extends GrammarAction<EncApRepPartContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
EncApRepPart encApRepPart = new EncApRepPart();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encAsRepPart/actions/StoreEncAsRepPart.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encAsRepPart/actions/StoreEncAsRepPart.java
index d73f8a8..7d6172f 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encAsRepPart/actions/StoreEncAsRepPart.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encAsRepPart/actions/StoreEncAsRepPart.java
@@ -65,10 +65,10 @@ public class StoreEncAsRepPart extends GrammarAction<EncAsRepPartContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the EncKdcRepPart
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/actions/EncKrbCredPartInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/actions/EncKrbCredPartInit.java
index 7d11b61..9e9a33a 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/actions/EncKrbCredPartInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/actions/EncKrbCredPartInit.java
@@ -63,10 +63,10 @@ public class EncKrbCredPartInit extends GrammarAction<EncKrbCredPartContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
EncKrbCredPart encKrbCredPart = new EncKrbCredPart();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/actions/StoreTicketInfo.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/actions/StoreTicketInfo.java
index 232d46a..ecf494c 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/actions/StoreTicketInfo.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/actions/StoreTicketInfo.java
@@ -57,10 +57,10 @@ public class StoreTicketInfo extends GrammarAction<EncKrbCredPartContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// decoder for KrbCredInfo
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbPrivPart/actions/EncKrbPrivPartInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbPrivPart/actions/EncKrbPrivPartInit.java
index 0a045e4..97cf4ca 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbPrivPart/actions/EncKrbPrivPartInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbPrivPart/actions/EncKrbPrivPartInit.java
@@ -63,10 +63,10 @@ public class EncKrbPrivPartInit extends GrammarAction<EncKrbPrivPartContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
EncKrbPrivPart encKrbPrivPart = new EncKrbPrivPart();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTgsRepPart/actions/StoreEncTgsRepPart.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTgsRepPart/actions/StoreEncTgsRepPart.java
index 2c8ea76..36acd74 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTgsRepPart/actions/StoreEncTgsRepPart.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTgsRepPart/actions/StoreEncTgsRepPart.java
@@ -65,10 +65,10 @@ public class StoreEncTgsRepPart extends GrammarAction<EncTgsRepPartContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the EncKdcRepPart
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/EncTicketPartInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/EncTicketPartInit.java
index 72bdc28..0955ec0 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/EncTicketPartInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/EncTicketPartInit.java
@@ -63,10 +63,10 @@ public class EncTicketPartInit extends GrammarAction<EncTicketPartContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
EncTicketPart encTicketPart = new EncTicketPart();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreTransited.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreTransited.java
index e32c367..de64fc5 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreTransited.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreTransited.java
@@ -66,10 +66,10 @@ public class StoreTransited extends GrammarAction<EncTicketPartContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
TransitedEncodingContainer transitedContainer = new TransitedEncodingContainer();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo/actions/AddETypeInfoEntry.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo/actions/AddETypeInfoEntry.java
index ecf9549..a9034b6 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo/actions/AddETypeInfoEntry.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo/actions/AddETypeInfoEntry.java
@@ -65,10 +65,10 @@ public class AddETypeInfoEntry extends GrammarAction<ETypeInfoContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the ETYPE-INFO-ENTRY
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2/actions/AddETypeInfo2Entry.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2/actions/AddETypeInfo2Entry.java
index 7143830..f7e213c 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2/actions/AddETypeInfo2Entry.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2/actions/AddETypeInfo2Entry.java
@@ -65,10 +65,10 @@ public class AddETypeInfo2Entry extends GrammarAction<ETypeInfo2Container>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the ETYPE-INFO2-ENTRY
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2Entry/actions/ETypeInfo2EntryInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2Entry/actions/ETypeInfo2EntryInit.java
index b806882..36dae35 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2Entry/actions/ETypeInfo2EntryInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2Entry/actions/ETypeInfo2EntryInit.java
@@ -63,10 +63,10 @@ public class ETypeInfo2EntryInit extends GrammarAction<ETypeInfo2EntryContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
ETypeInfo2Entry etypeInfo2Entry = new ETypeInfo2Entry();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2Entry/actions/StoreEType.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2Entry/actions/StoreEType.java
index 0eef54b..7354373 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2Entry/actions/StoreEType.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2Entry/actions/StoreEType.java
@@ -68,10 +68,10 @@ public class StoreEType extends GrammarAction<ETypeInfo2EntryContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// The etype is an integer
@@ -97,8 +97,7 @@ public class StoreEType extends GrammarAction<ETypeInfo2EntryContainer>
}
catch ( IntegerDecoderException ide )
{
- LOG.error( I18n.err( I18n.ERR_04070, Strings.dumpBytes( value.getData() ), ide
- .getLocalizedMessage() ) );
+ LOG.error( I18n.err( I18n.ERR_01310_INTEGER_DECODING_ERROR, Strings.dumpBytes( value.getData() ) ) );
// This will generate a PROTOCOL_ERROR
throw new DecoderException( ide.getMessage() );
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfoEntry/actions/ETypeInfoEntryInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfoEntry/actions/ETypeInfoEntryInit.java
index c87c155..4848a7e 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfoEntry/actions/ETypeInfoEntryInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfoEntry/actions/ETypeInfoEntryInit.java
@@ -63,10 +63,10 @@ public class ETypeInfoEntryInit extends GrammarAction<ETypeInfoEntryContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
ETypeInfoEntry etypeInfoEntry = new ETypeInfoEntry();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfoEntry/actions/StoreEType.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfoEntry/actions/StoreEType.java
index a366ba9..42a189a 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfoEntry/actions/StoreEType.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfoEntry/actions/StoreEType.java
@@ -68,10 +68,10 @@ public class StoreEType extends GrammarAction<ETypeInfoEntryContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// The etype is an integer
@@ -97,8 +97,7 @@ public class StoreEType extends GrammarAction<ETypeInfoEntryContainer>
}
catch ( IntegerDecoderException ide )
{
- LOG.error( I18n.err( I18n.ERR_04070, Strings.dumpBytes( value.getData() ), ide
- .getLocalizedMessage() ) );
+ LOG.error( I18n.err( I18n.ERR_01310_INTEGER_DECODING_ERROR, Strings.dumpBytes( value.getData() ) ) );
// This will generate a PROTOCOL_ERROR
throw new DecoderException( ide.getMessage() );
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/hostAddresses/actions/AddHostAddress.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/hostAddresses/actions/AddHostAddress.java
index 7133095..57a79d1 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/hostAddresses/actions/AddHostAddress.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/hostAddresses/actions/AddHostAddress.java
@@ -65,10 +65,10 @@ public class AddHostAddress extends GrammarAction<HostAddressesContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the HostAddress
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcRep/actions/AddPaData.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcRep/actions/AddPaData.java
index 1118f8b..60b2cb9 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcRep/actions/AddPaData.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcRep/actions/AddPaData.java
@@ -66,10 +66,10 @@ public class AddPaData extends GrammarAction<KdcRepContainer>
// The Length can't be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the PA-DATA
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcRep/actions/StoreTicket.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcRep/actions/StoreTicket.java
index 5e5b319..7b44520 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcRep/actions/StoreTicket.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcRep/actions/StoreTicket.java
@@ -66,10 +66,10 @@ public class StoreTicket extends GrammarAction<KdcRepContainer>
// The Length can't be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the Ticket
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReq/actions/AddPaData.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReq/actions/AddPaData.java
index b7ccdb7..4aab901 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReq/actions/AddPaData.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReq/actions/AddPaData.java
@@ -66,10 +66,10 @@ public class AddPaData extends GrammarAction<KdcReqContainer>
// The Length can't be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the PA-DATA
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReq/actions/StoreKdcReqBody.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReq/actions/StoreKdcReqBody.java
index 4c4bf42..755e70a 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReq/actions/StoreKdcReqBody.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReq/actions/StoreKdcReqBody.java
@@ -66,10 +66,10 @@ public class StoreKdcReqBody extends GrammarAction<KdcReqContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the KDC-REQ-BODY
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/AddEType.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/AddEType.java
index c3cd644..83be53e 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/AddEType.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/AddEType.java
@@ -68,10 +68,10 @@ public class AddEType extends GrammarAction<KdcReqBodyContainer>
// The Length can't be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
KdcReqBody kdcReqBody = kdcReqBodyContainer.getKdcReqBody();
@@ -92,8 +92,7 @@ public class AddEType extends GrammarAction<KdcReqBodyContainer>
}
catch ( IntegerDecoderException ide )
{
- LOG.error( I18n.err( I18n.ERR_04070, Strings.dumpBytes( value.getData() ), ide
- .getLocalizedMessage() ) );
+ LOG.error( I18n.err( I18n.ERR_01310_INTEGER_DECODING_ERROR, Strings.dumpBytes( value.getData() ) ) );
// This will generate a PROTOCOL_ERROR
throw new DecoderException( ide.getMessage() );
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/AddTicket.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/AddTicket.java
index 26433d0..de33f0c 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/AddTicket.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/AddTicket.java
@@ -66,10 +66,10 @@ public class AddTicket extends GrammarAction<KdcReqBodyContainer>
// The Length can't be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the Ticket
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/KdcReqBodyInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/KdcReqBodyInit.java
index ad39abb..3d02508 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/KdcReqBodyInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/KdcReqBodyInit.java
@@ -63,10 +63,10 @@ public class KdcReqBodyInit extends GrammarAction<KdcReqBodyContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
KdcReqBody kdcReqBody = new KdcReqBody();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreFrom.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreFrom.java
index 0f76da7..4436873 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreFrom.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreFrom.java
@@ -66,10 +66,10 @@ public class StoreFrom extends GrammarAction<KdcReqBodyContainer>
// The Length should not be null and should be 15
if ( tlv.getLength() != 15 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
KdcReqBody kdcReqBody = kdcReqBodyContainer.getKdcReqBody();
@@ -90,10 +90,10 @@ public class StoreFrom extends GrammarAction<KdcReqBodyContainer>
}
catch ( IllegalArgumentException iae )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
}
}
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreKdcOptions.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreKdcOptions.java
index 5241027..695e387 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreKdcOptions.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreKdcOptions.java
@@ -64,10 +64,10 @@ public class StoreKdcOptions extends GrammarAction<KdcReqBodyContainer>
// The Length should not be null, and should be 5
if ( tlv.getLength() != 5 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
KdcReqBody kdcReqBody = kdcReqBodyContainer.getKdcReqBody();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreTill.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreTill.java
index 9a54f63..5442596 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreTill.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreTill.java
@@ -66,10 +66,10 @@ public class StoreTill extends GrammarAction<KdcReqBodyContainer>
// The Length should not be null and should be 15
if ( tlv.getLength() != 15 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
KdcReqBody kdcReqBody = kdcReqBodyContainer.getKdcReqBody();
@@ -90,10 +90,10 @@ public class StoreTill extends GrammarAction<KdcReqBodyContainer>
}
catch ( IllegalArgumentException iae )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
}
}
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbCred/actions/KrbCredInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbCred/actions/KrbCredInit.java
index b826cd7..4e55d3d 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbCred/actions/KrbCredInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbCred/actions/KrbCredInit.java
@@ -63,10 +63,10 @@ public class KrbCredInit extends GrammarAction<KrbCredContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
KrbCred krbCred = new KrbCred();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbCred/actions/StoreTickets.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbCred/actions/StoreTickets.java
index 6d66438..0cf30bb 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbCred/actions/StoreTickets.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbCred/actions/StoreTickets.java
@@ -57,10 +57,10 @@ public class StoreTickets extends GrammarAction<KrbCredContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// decoder for Ticket
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbCredInfo/actions/KrbCredInfoInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbCredInfo/actions/KrbCredInfoInit.java
index 6c3a686..10ecc17 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbCredInfo/actions/KrbCredInfoInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbCredInfo/actions/KrbCredInfoInit.java
@@ -63,10 +63,10 @@ public class KrbCredInfoInit extends GrammarAction<KrbCredInfoContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
KrbCredInfo krbCredInfo = new KrbCredInfo();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/KrbErrorInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/KrbErrorInit.java
index 40ea8b7..29d6f3a 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/KrbErrorInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/KrbErrorInit.java
@@ -63,10 +63,10 @@ public class KrbErrorInit extends GrammarAction<KrbErrorContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
KrbError krbError = new KrbError();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreEText.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreEText.java
index 5c8a8e6..7e0e00f 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreEText.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreEText.java
@@ -65,10 +65,10 @@ public class StoreEText extends GrammarAction<KrbErrorContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// The value is the realm
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbPriv/actions/KrbPrivInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbPriv/actions/KrbPrivInit.java
index 18f4bc1..35cc3d4 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbPriv/actions/KrbPrivInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbPriv/actions/KrbPrivInit.java
@@ -63,10 +63,10 @@ public class KrbPrivInit extends GrammarAction<KrbPrivContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
KrbPriv krbPriv = new KrbPriv();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbSafe/actions/KrbSafeInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbSafe/actions/KrbSafeInit.java
index 4391324..57f2f4c 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbSafe/actions/KrbSafeInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbSafe/actions/KrbSafeInit.java
@@ -63,10 +63,10 @@ public class KrbSafeInit extends GrammarAction<KrbSafeContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
KrbSafe krbSafe = new KrbSafe();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbSafe/actions/StoreSafeBody.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbSafe/actions/StoreSafeBody.java
index 8c582da..09efa65 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbSafe/actions/StoreSafeBody.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbSafe/actions/StoreSafeBody.java
@@ -65,10 +65,10 @@ public class StoreSafeBody extends GrammarAction<KrbSafeContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the HostAddress
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbSafeBody/actions/KrbSafeBodyInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbSafeBody/actions/KrbSafeBodyInit.java
index 3184899..d93a911 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbSafeBody/actions/KrbSafeBodyInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbSafeBody/actions/KrbSafeBodyInit.java
@@ -63,10 +63,10 @@ public class KrbSafeBodyInit extends GrammarAction<KrbSafeBodyContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
KrbSafeBody krbSafeBody = new KrbSafeBody();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/lastReq/actions/LastReqInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/lastReq/actions/LastReqInit.java
index eb36309..904a1dd 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/lastReq/actions/LastReqInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/lastReq/actions/LastReqInit.java
@@ -63,10 +63,10 @@ public class LastReqInit extends GrammarAction<LastReqContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
LastReq lastReq = new LastReq();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/methodData/actions/AddPaData.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/methodData/actions/AddPaData.java
index 7fd0d79..0f4ee54 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/methodData/actions/AddPaData.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/methodData/actions/AddPaData.java
@@ -65,10 +65,10 @@ public class AddPaData extends GrammarAction<MethodDataContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the PA-DATA
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/paEncTsEnc/actions/PaEncTsEncInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/paEncTsEnc/actions/PaEncTsEncInit.java
index 36cec40..9a1441c 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/paEncTsEnc/actions/PaEncTsEncInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/paEncTsEnc/actions/PaEncTsEncInit.java
@@ -63,10 +63,10 @@ public class PaEncTsEncInit extends GrammarAction<PaEncTsEncContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
PaEncTsEnc paEncTsEnc = new PaEncTsEnc();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/padata/actions/StoreDataType.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/padata/actions/StoreDataType.java
index ea148ea..aa7b8fb 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/padata/actions/StoreDataType.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/padata/actions/StoreDataType.java
@@ -69,10 +69,10 @@ public class StoreDataType extends GrammarAction<PaDataContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
PaData paData = paDataContainer.getPaData();
@@ -92,8 +92,7 @@ public class StoreDataType extends GrammarAction<PaDataContainer>
}
catch ( IntegerDecoderException ide )
{
- LOG.error( I18n.err( I18n.ERR_04070, Strings.dumpBytes( value.getData() ), ide
- .getLocalizedMessage() ) );
+ LOG.error( I18n.err( I18n.ERR_01310_INTEGER_DECODING_ERROR, Strings.dumpBytes( value.getData() ) ) );
// This will generate a PROTOCOL_ERROR
throw new DecoderException( ide.getMessage() );
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsRep/actions/StoreKdcRep.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsRep/actions/StoreKdcRep.java
index f7cf29e..416e14b 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsRep/actions/StoreKdcRep.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsRep/actions/StoreKdcRep.java
@@ -66,10 +66,10 @@ public class StoreKdcRep extends GrammarAction<TgsRepContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the KDC-REP
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/actions/StoreKdcReq.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/actions/StoreKdcReq.java
index cb94cc7..e19fb32 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/actions/StoreKdcReq.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/actions/StoreKdcReq.java
@@ -66,10 +66,10 @@ public class StoreKdcReq extends GrammarAction<TgsReqContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
// Now, let's decode the KDC-REQ
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/transitedEncoding/actions/TransitedEncodingInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/transitedEncoding/actions/TransitedEncodingInit.java
index ad6fb3e..3d02796 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/transitedEncoding/actions/TransitedEncodingInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/transitedEncoding/actions/TransitedEncodingInit.java
@@ -63,10 +63,10 @@ public class TransitedEncodingInit extends GrammarAction<TransitedEncodingContai
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
TransitedEncoding transitedEncoding = new TransitedEncoding();
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/typedData/actions/TypedDataInit.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/typedData/actions/TypedDataInit.java
index 8a3d3d6..fd5428a 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/typedData/actions/TypedDataInit.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/typedData/actions/TypedDataInit.java
@@ -63,10 +63,10 @@ public class TypedDataInit extends GrammarAction<TypedDataContainer>
// The Length should not be null
if ( tlv.getLength() == 0 )
{
- LOG.error( I18n.err( I18n.ERR_04066 ) );
+ LOG.error( I18n.err( I18n.ERR_01308_ZERO_LENGTH_TLV ) );
// This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_01309_EMPTY_TLV ) );
}
if ( typedDataContainer.getTypedData() == null )
--
To stop receiving notification emails like this one, please contact
elecharny@apache.org.