Permalink
Commits on Apr 8, 2011
  1. refs #100425, 100432, 100435, 100419 Merge remote branch 'origin/1004…

    …25-android-startup'
    
    * origin/100425-android-startup: (39 commits)
      Refs #100425.  Removed another double-check for closed.  Modified getNetworkManager() to return null if the handle is closed.
      Refs #100425.  Remove a double check of _isOpen in get(ContentName ...), as that just turns around and does a get(Interest...).
      Refs #100419.  Close the read selector.  It is now opened in open() and closed in close().  There is a new lock that provides mutual exclusion between open() and close().
      Refs #100425.  Change the copyright date.  Also, make th elogging tag 1 word so setprop works.
      Refs #100425.  Change default log level to WARNING.  Don't close _km, close the default key manager.
      Refs #100425.  Make handle open/close log messages INFO level.
      Refs #100425.  Once the BasicKeyManager closes its handle, null it out.
      Refs #100425.  Calling _repo.shutdown closes the handle already, so don't double close it.
      Refs #100425.  Repo set its key manager as default, but then just closed the key manager without closing the default, so the default was pointing to a closed handle.
      refs #100425.  Fix copyright dates.
      Refs #100435.  Missed one set of handles to close properly and forgot to close the default key manager in one place.
      Refs #100435.  This test was very sloppy with its handles, and used closed handles all over the place.
      Refs #100435.  Forgot to make AfterClass method static.
      Refs #100435.  Ok, that didn't work, the test does CCN work in the setUpBeforeClass.  So, moved handle close to tearDownAfterClass.
      Refs #100435.  Pipeline test opens handles in BeforeClass but closes them in After.  Obviously that wont fly.  Moved hand open to Before.
      refs #100435.  Fix static super calls in yet another test.
      refs #100435.  Fix static super calls in yet another test.
      Refs #100435.  Fix the static super calls for setUpBeforeClass and tearDownAfterClass.
      Refs #100435.  Add a missed method that was calling down to the actual handle.
      Refs #100435.  Add @Overrides to methods overriden fom CCNHandle.
      ...
    Michael Plass committed Apr 8, 2011
Commits on Apr 6, 2011
  1. Merge remote branch 'origin/100419-channel-close' into 100425-android…

    …-startup
    
    Conflicts:
    	javasrc/src/org/ccnx/ccn/impl/CCNNetworkChannel.java
    mmosko committed Apr 6, 2011
  2. Refs #100425. Removed another double-check for closed. Modified getNe…

    …tworkManager() to return null if the handle is closed.
    mmosko committed Apr 6, 2011
  3. Refs #100425. Remove a double check of _isOpen in get(ContentName ...…

    …), as that just turns around and does a get(Interest...).
    mmosko committed Apr 6, 2011
  4. Refs #100419. Close the read selector. It is now opened in open() and…

    … closed in close(). There is a new lock that provides mutual exclusion between open() and close().
    mmosko committed Apr 6, 2011
Commits on Apr 5, 2011
  1. Refs #100425. Change the copyright date. Also, make th elogging tag 1

    word so setprop works.
    mmosko committed Apr 5, 2011
  2. Refs #100425. Change default log level to WARNING. Don't close _km,

    close the default key manager.
    mmosko committed Apr 5, 2011
  3. Refs #100425. Calling _repo.shutdown closes the handle already, so

    don't double close it.
    mmosko committed Apr 5, 2011
  4. Refs #100425. Repo set its key manager as default, but then just closed

    the key manager without closing the default, so the default was pointing
    to a closed handle.
    mmosko committed Apr 5, 2011
  5. Refs #100435. Missed one set of handles to close properly and forgot to

    close the default key manager in one place.
    mmosko committed Apr 5, 2011
  6. Refs #100435. This test was very sloppy with its handles, and used

    closed handles all over the place.
    mmosko committed Apr 5, 2011
  7. Refs #100435. Ok, that didn't work, the test does CCN work in the

    setUpBeforeClass.  So, moved handle close to tearDownAfterClass.
    mmosko committed Apr 5, 2011
  8. Refs #100435. Pipeline test opens handles in BeforeClass but closes

    them in After.  Obviously that wont fly.  Moved hand open to Before.
    mmosko committed Apr 5, 2011
  9. Refs #100435. Fix the static super calls for setUpBeforeClass and

    tearDownAfterClass.
    mmosko committed Apr 5, 2011
Commits on Apr 4, 2011
  1. refs #100434 Merge remote branch 'origin/100434-facemanager'

    * origin/100434-facemanager:
      Update FaceManagerTest.java to exercise the NACK in response to deleting an already deleted face.  Refs #100434
      Update PrefixRegistrationManagerTest.java to exercise the NACK in response to prefix registration on bogus faceID.  Refs #100434
      Check for NACK in CCNDaemonHandle.sendIt() response handler, and raise CCNDaemonException if encountered.  Refs #100434
    Michael Plass committed Apr 4, 2011
  2. Update FaceManagerTest.java to exercise the NACK in response to delet…

    …ing an already deleted face. Refs #100434
    Nick Briggs committed Apr 4, 2011
  3. Update PrefixRegistrationManagerTest.java to exercise the NACK in res…

    …ponse to prefix registration on bogus faceID. Refs #100434
    Nick Briggs committed Apr 4, 2011
  4. refs #100432 Merge remote branch 'origin/100432-logging'

    * origin/100432-logging:
      Refs #100432.  Forgot to make CCNHandle's count static.
      refs #100432.  Fix type in NetworkManager logging.  Add better logging to CCNHandle too.
      Refs #100432.  Make NetworkManager and NetworkChannel log messages look something like this:
    Michael Plass committed Apr 4, 2011
  5. Refs #100435. Cleanup the initialization and shutdown of the testing

    heirarchy.  Handles are now opened on the setUpBeforeClass.  The
    tearDownAfterClass now closes the default keymanager.
    mmosko committed Apr 4, 2011
  6. Refs #100435. Make keymanager and netmanager final members. fix the

    test constructor to use nulls for them.  Cleanup some logging and add
    extra debugging logging under FINE level.
    mmosko committed Apr 4, 2011
  7. Check for NACK in CCNDaemonHandle.sendIt() response handler, and rais…

    …e CCNDaemonException if encountered. Refs #100434
    
    This exception will propagate up to the FaceManager and PrefixRegistrationManager.
    Nick Briggs committed Apr 4, 2011