Merge branch 'master' into greg-node-12-7

apigee · Aug 25, 2015 · 361c812 · 361c812
2 parents f1b0c64 + a310808
commit 361c812
Show file tree

Hide file tree

Showing 12 changed files with 3,426 additions and 916 deletions.
diff --git a/core/src/main/java/io/apigee/trireme/core/ArgUtils.java b/core/src/main/java/io/apigee/trireme/core/ArgUtils.java
@@ -430,7 +430,7 @@ public static int parseUnsignedIntForgiveably(Object o)
             if (dVal > (double)Integer.MAX_VALUE) {
                 return -1;
             }
-            return (int)Math.ceil(dVal);
+            return (int)Math.floor(dVal);
         }
         if (val instanceof Number) {
             Number num = (Number)val;

diff --git a/core/src/main/java/io/apigee/trireme/core/internal/ScriptRunner.java b/core/src/main/java/io/apigee/trireme/core/internal/ScriptRunner.java
@@ -38,7 +38,6 @@
 import io.apigee.trireme.kernel.PathTranslator;
 import io.apigee.trireme.kernel.fs.AdvancedFilesystem;
 import io.apigee.trireme.kernel.fs.BasicFilesystem;
-import io.apigee.trireme.kernel.handles.IpcHandle;
 import io.apigee.trireme.kernel.net.NetworkPolicy;
 import io.apigee.trireme.kernel.net.SelectorHandler;
 import org.mozilla.javascript.Context;
@@ -126,7 +125,6 @@ public class ScriptRunner
     // Globals that are set up for the process
     private NativeModule.NativeImpl nativeModule;
     protected AbstractProcess    process;
-    private Buffer.BufferModuleImpl buffer;
     private String              workingDirectory;
     private String              scriptFileName;
     private TriremeProcess      parentProcess;
@@ -282,10 +280,6 @@ public NativeModule.NativeImpl getNativeModule() {
         return nativeModule;
     }
 
-    public Buffer.BufferModuleImpl getBufferModule() {
-        return buffer;
-    }
-
     @Override
     public Selector getSelector() {
         return selector;
@@ -1180,9 +1174,6 @@ private void initGlobals(Context cx)
             process.setConnected(parentProcess != null);
             scope.put("process", scope, process);
 
-            // The buffer module needs special handling because of the "charsWritten" variable
-            buffer = (Buffer.BufferModuleImpl)require("buffer", cx);
-
         } catch (InvocationTargetException e) {
             throw new NodeException(e);
         } catch (IllegalAccessException e) {