mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Jean-Noel Rouvignac
03.32.2014 f621f2931b8a47a666e180093fbc11416078f191
opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
@@ -352,8 +352,7 @@
                .getAuthenticationPolicy(policyDN);
            if (authPolicy == null)
            {
              logger.warn(WARN_PLUGIN_PWIMPORT_NO_SUCH_POLICY, String
                  .valueOf(entry.getName()), String.valueOf(policyDN));
              logger.warn(WARN_PLUGIN_PWIMPORT_NO_SUCH_POLICY, entry.getName(), policyDN);
            }
            else if (authPolicy.isPasswordPolicy())
            {
@@ -364,8 +363,7 @@
          }
          catch (DirectoryException de)
          {
            logger.warn(WARN_PLUGIN_PWIMPORT_CANNOT_DECODE_POLICY_DN, String
                .valueOf(entry.getName()), de.getMessageObject());
            logger.warn(WARN_PLUGIN_PWIMPORT_CANNOT_DECODE_POLICY_DN, entry.getName(), de.getMessageObject());
            break policyLoop;
          }
        }
@@ -409,8 +407,7 @@
                    logger.traceException(e);
                    logger.error(ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD,
                        policy.getPasswordAttribute().getNameOrOID(), String
                            .valueOf(entry.getName()),
                        policy.getPasswordAttribute().getNameOrOID(), entry.getName(),
                        stackTraceToSingleLineString(e));
                    gotError = true;
                    break;
@@ -439,8 +436,7 @@
                    logger.traceException(e);
                    logger.error(ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD,
                        policy.getPasswordAttribute().getNameOrOID(), String
                            .valueOf(entry.getName()),
                        policy.getPasswordAttribute().getNameOrOID(), entry.getName(),
                        stackTraceToSingleLineString(e));
                    gotError = true;
                    break;
@@ -497,10 +493,8 @@
            catch (Exception e)
            {
              logger.traceException(e);
              logger.error(ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD, t
                  .getNameOrOID(), String.valueOf(entry.getName()),
                  stackTraceToSingleLineString(e));
              logger.error(ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD,
                  t.getNameOrOID(), entry.getName(), stackTraceToSingleLineString(e));
              gotError = true;
              break;
            }
@@ -551,10 +545,8 @@
            catch (Exception e)
            {
              logger.traceException(e);
              logger.error(ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD, t
                  .getNameOrOID(), String.valueOf(entry.getName()),
                  stackTraceToSingleLineString(e));
              logger.error(ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD,
                  t.getNameOrOID(), entry.getName(), stackTraceToSingleLineString(e));
              gotError = true;
              break;
            }