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/01/28 22:37:13 UTC
[directory-ldap-api] branch master updated: o Changed an error
message o Fixed a few typoes
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-ldap-api.git
The following commit(s) were added to refs/heads/master by this push:
new 5b68d06 o Changed an error message o Fixed a few typoes
5b68d06 is described below
commit 5b68d06104740fefd94bf9d0d151f99ad8c678a5
Author: Emmanuel Lécharny <el...@symas.com>
AuthorDate: Sun Jan 28 23:37:01 2018 +0100
o Changed an error message
o Fixed a few typoes
---
i18n/src/main/java/org/apache/directory/api/i18n/I18n.java | 2 +-
i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties | 2 +-
.../ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java | 2 +-
.../ads_impl/certGeneration/CertGenerationRequestDecorator.java | 2 +-
.../ads_impl/endTransaction/EndTransactionRequestDecorator.java | 2 +-
.../extended/ads_impl/endTransaction/EndTransactionRequestGrammar.java | 2 +-
.../ads_impl/endTransaction/EndTransactionRequestStatesEnum.java | 2 +-
.../ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java | 2 +-
.../extended/ads_impl/pwdModify/PasswordModifyRequestDecorator.java | 2 +-
.../extended/ads_impl/pwdModify/PasswordModifyResponseDecorator.java | 2 +-
.../ads_impl/storedProcedure/StoredProcedureRequestDecorator.java | 2 +-
.../ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseDecorator.java | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/i18n/src/main/java/org/apache/directory/api/i18n/I18n.java b/i18n/src/main/java/org/apache/directory/api/i18n/I18n.java
index 4c2bf02..e9f31bd 100644
--- a/i18n/src/main/java/org/apache/directory/api/i18n/I18n.java
+++ b/i18n/src/main/java/org/apache/directory/api/i18n/I18n.java
@@ -303,7 +303,7 @@ public enum I18n
ERR_04162("ERR_04162"),
ERR_04163("ERR_04163"),
ERR_04164("ERR_04164"),
- ERR_04165("ERR_04165"),
+ ERR_04165_PAYLOAD_DECODING_ERROR("ERR_04165_PAYLOAD_DECODING_ERROR"),
ERR_04166("ERR_04166"),
ERR_04167("ERR_04167"),
ERR_04168("ERR_04168"),
diff --git a/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties b/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties
index ca14fd9..c4df656 100644
--- a/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties
+++ b/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties
@@ -290,7 +290,7 @@ ERR_04161=Unknown LDAP URL scope value: {0}
ERR_04162=Invalid attribute {0} for a refinement
ERR_04163=Unknown SyncStateTypeEnum value {0}
ERR_04164=Failed to encode payload GracefulShutdownRequest
-ERR_04165=failed to decode payload
+ERR_04165_PAYLOAD_DECODING_ERROR=failed to decode payload
ERR_04166=The result code can only be one of: {0}, {1}, {2}
ERR_04167=Failed to encode payload CertGenerateRequest
ERR_04168=the OID is fixed: {0}
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java
index 7fc3cd4..ed7b8c9 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java
@@ -144,7 +144,7 @@ public class CancelRequestDecorator extends ExtendedRequestDecorator<CancelReque
}
catch ( DecoderException e )
{
- LOG.error( I18n.err( I18n.ERR_04165 ), e );
+ LOG.error( I18n.err( I18n.ERR_04165_PAYLOAD_DECODING_ERROR ), e );
throw new RuntimeException( e );
}
}
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java
index f43b41d..98433cb 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java
@@ -99,7 +99,7 @@ public class CertGenerationRequestDecorator extends ExtendedRequestDecorator<Cer
}
catch ( DecoderException e )
{
- LOG.error( I18n.err( I18n.ERR_04165 ), e );
+ LOG.error( I18n.err( I18n.ERR_04165_PAYLOAD_DECODING_ERROR ), e );
throw new RuntimeException( e );
}
}
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/endTransaction/EndTransactionRequestDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/endTransaction/EndTransactionRequestDecorator.java
index 4e4768c..5508f05 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/endTransaction/EndTransactionRequestDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/endTransaction/EndTransactionRequestDecorator.java
@@ -140,7 +140,7 @@ public class EndTransactionRequestDecorator extends ExtendedRequestDecorator<End
}
catch ( DecoderException e )
{
- LOG.error( I18n.err( I18n.ERR_04165 ), e );
+ LOG.error( I18n.err( I18n.ERR_04165_PAYLOAD_DECODING_ERROR ), e );
throw new RuntimeException( e );
}
}
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/endTransaction/EndTransactionRequestGrammar.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/endTransaction/EndTransactionRequestGrammar.java
index 13b62e9..f012f10 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/endTransaction/EndTransactionRequestGrammar.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/endTransaction/EndTransactionRequestGrammar.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
/**
- * This class implements the EndTransactionRequest extended operation's ASN.1 grammer.
+ * This class implements the EndTransactionRequest extended operation's ASN.1 grammar.
* All the actions are declared in this class. As it is a singleton,
* these declaration are only done once. The grammar is :
*
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/endTransaction/EndTransactionRequestStatesEnum.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/endTransaction/EndTransactionRequestStatesEnum.java
index d28be3c..9fc8b5f 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/endTransaction/EndTransactionRequestStatesEnum.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/endTransaction/EndTransactionRequestStatesEnum.java
@@ -43,7 +43,7 @@ public enum EndTransactionRequestStatesEnum implements States
/** The commit flag */
COMMIT_STATE,
- /** he identifier state */
+ /** The identifier state */
IDENTFIER_STATE,
/** Last state */
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java
index 3e7f6dc..e44497a 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java
@@ -89,7 +89,7 @@ public class GracefulShutdownRequestDecorator extends ExtendedRequestDecorator<G
}
catch ( DecoderException e )
{
- LOG.error( I18n.err( I18n.ERR_04165 ), e );
+ LOG.error( I18n.err( I18n.ERR_04165_PAYLOAD_DECODING_ERROR ), e );
throw new RuntimeException( e );
}
}
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecorator.java
index ddd4a6c..a90734e 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecorator.java
@@ -87,7 +87,7 @@ public class PasswordModifyRequestDecorator extends ExtendedRequestDecorator<Pas
}
catch ( DecoderException e )
{
- LOG.error( I18n.err( I18n.ERR_04165 ), e );
+ LOG.error( I18n.err( I18n.ERR_04165_PAYLOAD_DECODING_ERROR ), e );
throw new RuntimeException( e );
}
}
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseDecorator.java
index 19faba6..c689145 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseDecorator.java
@@ -88,7 +88,7 @@ public class PasswordModifyResponseDecorator extends ExtendedResponseDecorator<P
}
catch ( DecoderException e )
{
- LOG.error( I18n.err( I18n.ERR_04165 ), e );
+ LOG.error( I18n.err( I18n.ERR_04165_PAYLOAD_DECODING_ERROR ), e );
throw new RuntimeException( e );
}
}
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java
index 48d31e9..1b80941 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java
@@ -300,7 +300,7 @@ public class StoredProcedureRequestDecorator extends ExtendedRequestDecorator<St
}
catch ( Exception e )
{
- LOG.error( I18n.err( I18n.ERR_04165 ), e );
+ LOG.error( I18n.err( I18n.ERR_04165_PAYLOAD_DECODING_ERROR ), e );
throw new RuntimeException( e );
}
}
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseDecorator.java
index 787b136..331bbb4 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseDecorator.java
@@ -82,7 +82,7 @@ public class WhoAmIResponseDecorator extends ExtendedResponseDecorator<WhoAmIRes
}
catch ( DecoderException e )
{
- LOG.error( I18n.err( I18n.ERR_04165 ), e );
+ LOG.error( I18n.err( I18n.ERR_04165_PAYLOAD_DECODING_ERROR ), e );
throw new RuntimeException( e );
}
}
--
To stop receiving notification emails like this one, please contact
elecharny@apache.org.