Merge ASN1 branch to trunk

matthew_swift

05.42.2009 22094368c2865dcfb6daf8366425212b721a4657

 opends/src/server/org/opends/server/monitors/ConnectionHandlerMonitor.java

@@ -38,15 +38,7 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ConnectionHandler;
import org.opends.server.api.MonitorProvider;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.Attributes;
import org.opends.server.types.DirectoryConfig;
import org.opends.server.types.HostPort;
import org.opends.server.types.ObjectClass;

import org.opends.server.types.*;


/**
@@ -199,7 +191,7 @@
      AttributeBuilder builder = new AttributeBuilder(listenerType);
      for (HostPort hp : listeners)
      {
        builder.add(new AttributeValue(listenerType, hp.toString()));
        builder.add(AttributeValues.create(listenerType, hp.toString()));
      }
      attrs.add(builder.toAttribute());
    }
@@ -210,7 +202,7 @@
      for (ClientConnection c : conns)
      {
        numConnections++;
        builder.add(new AttributeValue(connectionsType, c
        builder.add(AttributeValues.create(connectionsType, c
            .getMonitorSummary()));
      }
      attrs.add(builder.toAttribute());