Minor corrections.

Netflix · Sep 19, 2016 · 278deb7 · 278deb7
1 parent 716f77e
commit 278deb7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/core/src/main/java/com/netflix/msl/keyx/AsymmetricWrappedExchange.java b/core/src/main/java/com/netflix/msl/keyx/AsymmetricWrappedExchange.java
@@ -770,7 +770,6 @@ public ICryptoContext getCryptoContext(final MslContext ctx, final KeyRequestDat
         final RequestData request = (RequestData)keyRequestData;
         if (!(keyResponseData instanceof ResponseData))
             throw new MslInternalException("Key response data " + keyResponseData.getClass().getName() + " was not created by this factory.");
-
         final ResponseData response = (ResponseData)keyResponseData;
 
         // Verify response matches request.

diff --git a/core/src/main/javascript/io/OutputStream.js b/core/src/main/javascript/io/OutputStream.js
@@ -53,7 +53,8 @@ var OutputStream = util.Class.create({
      * @param {Uint8Array} data the data to write.
      * @param {number} off offset into the data.
      * @param {number} len number of bytes to write.
-     * @param {number} timeout write timeout in milliseconds.
+     * @param {number} timeout write timeout in milliseconds or -1 for no
+     *        timeout.
      * @param {{result: function(number), timeout: function(number), error: function(Error)}}
      *        callback the callback that will receive the number of bytes
      *        written which will be less than the length if aborted, be

diff --git a/tests/src/test/java/com/netflix/msl/msg/MessageBuilderSuite.java b/tests/src/test/java/com/netflix/msl/msg/MessageBuilderSuite.java
@@ -978,7 +978,7 @@ public void deleteUnknownPeerServiceToken() throws MslException {
             final Set<ServiceToken> tokens = messageHeader.getPeerServiceTokens();
             for (final ServiceToken token : tokens) {
                 if (token.getName().equals(SERVICE_TOKEN_NAME))
-                    fail("Deleted unknown service token.");
+                    fail("Deleted unknown peer service token.");
             }
         }
 

diff --git a/tests/src/test/java/com/netflix/msl/util/SimpleMslStoreTest.java b/tests/src/test/java/com/netflix/msl/util/SimpleMslStoreTest.java
@@ -215,7 +215,7 @@ public void clearTwoCryptoContexts() throws MslEncodingException, MslCryptoExcep
 
         store.clearCryptoContexts();
         assertNull(store.getCryptoContext(mtA));
-        assertNull(store.getCryptoContext(mtA));
+        assertNull(store.getCryptoContext(mtB));
         assertNull(store.getMasterToken());
     }