Make several significant changes to the OpenDS code base, including:

neil_a_wilson

25.40.2007 44aad3f84d2a820094f3b5e73722778edc8c23f5

 opends/src/server/org/opends/server/extensions/FIFOEntryCache.java

@@ -238,7 +238,7 @@
      // Log an error message.
      logError(ErrorLogCategory.CONFIGURATION, ErrorLogSeverity.SEVERE_ERROR,
               MSGID_FIFOCACHE_CANNOT_DETERMINE_MAX_MEMORY_PCT,
               String.valueOf(configEntryDN), stackTraceToSingleLineString(e),
               String.valueOf(configEntryDN), getExceptionMessage(e),
               maxMemoryPercent);
    }

@@ -276,7 +276,7 @@
      // Log an error message.
      logError(ErrorLogCategory.CONFIGURATION, ErrorLogSeverity.SEVERE_ERROR,
               MSGID_FIFOCACHE_CANNOT_DETERMINE_MAX_ENTRIES,
               String.valueOf(configEntryDN), stackTraceToSingleLineString(e));
               String.valueOf(configEntryDN), getExceptionMessage(e));
    }


@@ -311,7 +311,7 @@
      // Log an error message.
      logError(ErrorLogCategory.CONFIGURATION, ErrorLogSeverity.SEVERE_ERROR,
               MSGID_FIFOCACHE_CANNOT_DETERMINE_LOCK_TIMEOUT,
               String.valueOf(configEntryDN), stackTraceToSingleLineString(e),
               String.valueOf(configEntryDN), getExceptionMessage(e),
               lockTimeout);
    }

@@ -359,7 +359,7 @@
                       ErrorLogSeverity.SEVERE_WARNING,
                       MSGID_FIFOCACHE_CANNOT_DECODE_INCLUDE_FILTER,
                       String.valueOf(configEntryDN), filterString,
                       stackTraceToSingleLineString(e));
                       getExceptionMessage(e));
            }
          }

@@ -383,7 +383,7 @@
      // Log an error message.
      logError(ErrorLogCategory.CONFIGURATION, ErrorLogSeverity.SEVERE_ERROR,
               MSGID_FIFOCACHE_CANNOT_DETERMINE_INCLUDE_FILTERS,
               String.valueOf(configEntryDN), stackTraceToSingleLineString(e));
               String.valueOf(configEntryDN), getExceptionMessage(e));
    }


@@ -430,7 +430,7 @@
                       ErrorLogSeverity.SEVERE_WARNING,
                       MSGID_FIFOCACHE_CANNOT_DECODE_EXCLUDE_FILTER,
                       String.valueOf(configEntryDN), filterString,
                       stackTraceToSingleLineString(e));
                       getExceptionMessage(e));
            }
          }

@@ -454,7 +454,7 @@
      // Log an error message.
      logError(ErrorLogCategory.CONFIGURATION, ErrorLogSeverity.SEVERE_ERROR,
               MSGID_FIFOCACHE_CANNOT_DETERMINE_EXCLUDE_FILTERS,
               String.valueOf(configEntryDN), stackTraceToSingleLineString(e));
               String.valueOf(configEntryDN), getExceptionMessage(e));
    }
  }

@@ -1661,7 +1661,7 @@
      // An error occurred, so the provided value must not be valid.
      msgID = MSGID_FIFOCACHE_INVALID_MAX_MEMORY_PCT;
      unacceptableReasons.add(getMessage(msgID, String.valueOf(configEntryDN),
                                         stackTraceToSingleLineString(e)));
                                         getExceptionMessage(e)));
      configIsAcceptable = false;
    }

@@ -1688,7 +1688,7 @@
      // An error occurred, so the provided value must not be valid.
      msgID = MSGID_FIFOCACHE_INVALID_MAX_ENTRIES;
      unacceptableReasons.add(getMessage(msgID, String.valueOf(configEntryDN),
                                         stackTraceToSingleLineString(e)));
                                         getExceptionMessage(e)));
      configIsAcceptable = false;
    }

@@ -1715,7 +1715,7 @@
      // An error occurred, so the provided value must not be valid.
      msgID = MSGID_FIFOCACHE_INVALID_LOCK_TIMEOUT;
      unacceptableReasons.add(getMessage(msgID, String.valueOf(configEntryDN),
                                         stackTraceToSingleLineString(e)));
                                         getExceptionMessage(e)));
      configIsAcceptable = false;
    }

@@ -1761,7 +1761,7 @@
              unacceptableReasons.add(getMessage(msgID,
                                           String.valueOf(configEntryDN),
                                            filterString,
                                            stackTraceToSingleLineString(e)));
                                            getExceptionMessage(e)));
              configIsAcceptable = false;
            }
          }
@@ -1778,7 +1778,7 @@
      // An error occurred, so the provided value must not be valid.
      msgID = MSGID_FIFOCACHE_INVALID_INCLUDE_FILTERS;
      unacceptableReasons.add(getMessage(msgID, String.valueOf(configEntryDN),
                                         stackTraceToSingleLineString(e)));
                                         getExceptionMessage(e)));
      configIsAcceptable = false;
    }

@@ -1824,7 +1824,7 @@
              unacceptableReasons.add(getMessage(msgID,
                                           String.valueOf(configEntryDN),
                                            filterString,
                                            stackTraceToSingleLineString(e)));
                                            getExceptionMessage(e)));
              configIsAcceptable = false;
            }
          }
@@ -1841,7 +1841,7 @@
      // An error occurred, so the provided value must not be valid.
      msgID = MSGID_FIFOCACHE_INVALID_EXCLUDE_FILTERS;
      unacceptableReasons.add(getMessage(msgID, String.valueOf(configEntryDN),
                                         stackTraceToSingleLineString(e)));
                                         getExceptionMessage(e)));
      configIsAcceptable = false;
    }

@@ -1905,7 +1905,7 @@
      // An error occurred, so the provided value must not be valid.
      msgID = MSGID_FIFOCACHE_INVALID_MAX_MEMORY_PCT;
      messages.add(getMessage(msgID, String.valueOf(configEntryDN),
                              stackTraceToSingleLineString(e)));
                              getExceptionMessage(e)));
      resultCode = ResultCode.CONSTRAINT_VIOLATION;
      configIsAcceptable = false;
    }
@@ -1938,7 +1938,7 @@
      // An error occurred, so the provided value must not be valid.
      msgID = MSGID_FIFOCACHE_INVALID_MAX_ENTRIES;
      messages.add(getMessage(msgID, String.valueOf(configEntryDN),
                              stackTraceToSingleLineString(e)));
                              getExceptionMessage(e)));

      if (resultCode == ResultCode.SUCCESS)
      {
@@ -1976,7 +1976,7 @@
      // An error occurred, so the provided value must not be valid.
      msgID = MSGID_FIFOCACHE_INVALID_LOCK_TIMEOUT;
      messages.add(getMessage(msgID, String.valueOf(configEntryDN),
                              stackTraceToSingleLineString(e)));
                              getExceptionMessage(e)));

      if (resultCode == ResultCode.SUCCESS)
      {
@@ -2025,7 +2025,7 @@
              msgID = MSGID_FIFOCACHE_INVALID_INCLUDE_FILTER;
              messages.add(getMessage(msgID, String.valueOf(configEntryDN),
                                      filterString,
                                      stackTraceToSingleLineString(e)));
                                      getExceptionMessage(e)));

              if (resultCode == ResultCode.SUCCESS)
              {
@@ -2048,7 +2048,7 @@
      // An error occurred, so the provided value must not be valid.
      msgID = MSGID_FIFOCACHE_INVALID_INCLUDE_FILTERS;
      messages.add(getMessage(msgID, String.valueOf(configEntryDN),
                              stackTraceToSingleLineString(e)));
                              getExceptionMessage(e)));

      if (resultCode == ResultCode.SUCCESS)
      {
@@ -2096,8 +2096,7 @@
              // We couldn't decode this filter, so it isn't valid.
              msgID = MSGID_FIFOCACHE_INVALID_EXCLUDE_FILTER;
              messages.add(getMessage(msgID, String.valueOf(configEntryDN),
                                      filterString,
                                      stackTraceToSingleLineString(e)));
                                      filterString, getExceptionMessage(e)));

              if (resultCode == ResultCode.SUCCESS)
              {
@@ -2120,7 +2119,7 @@
      // An error occurred, so the provided value must not be valid.
      msgID = MSGID_FIFOCACHE_INVALID_EXCLUDE_FILTERS;
      messages.add(getMessage(msgID, String.valueOf(configEntryDN),
                              stackTraceToSingleLineString(e)));
                              getExceptionMessage(e)));

      if (resultCode == ResultCode.SUCCESS)
      {