geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dschnei...@apache.org
Subject [08/10] incubator-geode git commit: removed call to non-existent OSProcess$NativeOSCalls
Date Thu, 02 Jun 2016 18:31:12 GMT
removed call to non-existent OSProcess$NativeOSCalls


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/19ed16da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/19ed16da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/19ed16da

Branch: refs/heads/feature/GEODE-1464
Commit: 19ed16daed63582e2186b63bb3e1a084af47b0a7
Parents: 0c6c16f
Author: Darrel Schneider <dschneider@pivotal.io>
Authored: Thu Jun 2 11:11:02 2016 -0700
Committer: Darrel Schneider <dschneider@pivotal.io>
Committed: Thu Jun 2 11:11:02 2016 -0700

----------------------------------------------------------------------
 .../gemfire/internal/shared/NativeCalls.java    | 33 ++++----------------
 1 file changed, 6 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/19ed16da/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCalls.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCalls.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCalls.java
index f0fc27a..02df4ca 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCalls.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCalls.java
@@ -17,7 +17,6 @@
 
 package com.gemstone.gemfire.internal.shared;
 
-import java.io.File;
 import java.io.FileDescriptor;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -38,21 +37,17 @@ import com.gemstone.gemfire.SystemFailure;
  * Encapsulates native C/C++ calls via JNA. To obtain an instance of
  * implementation for a platform, use {@link NativeCalls#getInstance()}.
  * 
- * This class is also referenced by ODBC/.NET drivers so it should not refer to
- * any classes other than standard JDK or those within the same package.
- * 
  * @since 8.0
  */
 public abstract class NativeCalls {
 
   /**
    * Static instance of NativeCalls implementation. This can be one of JNA
-   * implementations in <code>NativeCallsJNAImpl</code> or can fallback to a
+   * implementations in <code>NativeCallsJNAImpl</code> or can fall back to a
    * generic implementation in case JNA is not available for the platform.
    * 
-   * Note: this variable is deliberately not final since other drivers like
-   * those for ADO.NET or ODBC will plugin their own native implementations of
-   * NativeCalls.
+   * Note: this variable is deliberately not final so that other clients 
+   * can plug in their own native implementations of NativeCalls.
    */
   protected static NativeCalls instance;
 
@@ -60,7 +55,7 @@ public abstract class NativeCalls {
     NativeCalls inst;
     try {
       // try to load JNA implementation first
-      // we do it via reflection since some clients like ADO.NET/ODBC
+      // we do it via reflection since some clients
       // may not have it
       final Class<?> c = Class
           .forName("com.gemstone.gemfire.internal.shared.NativeCallsJNAImpl");
@@ -73,24 +68,8 @@ public abstract class NativeCalls {
       inst = null;
     }
     if (inst == null) {
-      // In case JNA implementations cannot be loaded, fallback to generic
-      // implementations.
-      // Other clients like ADO.NET/ODBC will plugin their own implementations.
-      try {
-        // using reflection to get the implementation based on OSProcess
-        // since this is also used by GemFireXD client; at some point all the
-        // functionality of OSProcess should be folded into the JNA impl
-        final Class<?> c = Class
-            .forName("com.gemstone.gemfire.internal.OSProcess$NativeOSCalls");
-        inst = (NativeCalls)c.newInstance();
-      } catch (VirtualMachineError e) {
-        SystemFailure.initiateFailure(e);
-        throw e;
-      } catch (Throwable t) {
-        SystemFailure.checkFailure();
-        // fallback to generic impl in case of a problem
-        inst = new NativeCallsGeneric();
-      }
+      // fall back to generic implementation in case of a problem
+      inst = new NativeCallsGeneric();
     }
     instance = inst;
   }


Mime
View raw message