Merge ASN1 branch to trunk

matthew_swift

05.42.2009 22094368c2865dcfb6daf8366425212b721a4657

 opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java

@@ -441,10 +441,10 @@
      byte[] shortBytes = new byte[3];
      DatabaseEntry key= new DatabaseEntry(shortBytes);
      Entry testEntry=bldStatEntry(junkDN);
      byte []entryBytes =
           JebFormat.entryToDatabase(testEntry,
      ByteString entryBytes =
           ID2Entry.entryToDatabase(testEntry,
                                     new DataConfig(false, false, null));
      DatabaseEntry data= new DatabaseEntry(entryBytes);
      DatabaseEntry data= new DatabaseEntry(entryBytes.toByteArray());
      assertTrue(id2entry.putRaw(txn, key, data));

      //add entry with ramdom bytes
@@ -773,8 +773,8 @@
    DatabaseEntry key= new EntryID(id).getDatabaseEntry();
    Entry testEntry=bldStatEntry(dn);
    byte []entryBytes =
         JebFormat.entryToDatabase(testEntry,
                                   new DataConfig(false, false, null));
         ID2Entry.entryToDatabase(testEntry,
                                   new DataConfig(false, false, null)).toByteArray();
    if(trashFormat)
      entryBytes[0] = 0x67;
    DatabaseEntry data= new DatabaseEntry(entryBytes);
@@ -876,7 +876,7 @@
      attrType = DirectoryServer.getDefaultAttributeType(type);
    List<Attribute> attrList = e.getAttribute(attrType, null);
    AttributeValue v = attrList.get(0).iterator().next();
    long retVal = Long.parseLong(v.getStringValue());
    long retVal = Long.parseLong(v.getValue().toString());
    return (retVal);
  }