Follow on 2.6_was fix for 465452.
Signed-off-by: Rick Curtis <curtisr7@gmail.com>
diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/exceptions/i18n/ServerPlatformExceptionResource.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/exceptions/i18n/ServerPlatformExceptionResource.java
index 8f96242..1f23b2e 100644
--- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/exceptions/i18n/ServerPlatformExceptionResource.java
+++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/exceptions/i18n/ServerPlatformExceptionResource.java
@@ -18,7 +18,7 @@
static final Object[][] contents = {
{ "63001", "Server platform class {0} not found." },
- { "63002", "Server platform class is invalid: {0}" }
+ { "63002", "Server platform class is invalid: " }
};
/**
diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/sessions/factories/SessionManager.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/sessions/factories/SessionManager.java
index 7132ed4..da30339 100644
--- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/sessions/factories/SessionManager.java
+++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/sessions/factories/SessionManager.java
@@ -21,6 +21,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import org.eclipse.persistence.exceptions.ServerPlatformException;
import org.eclipse.persistence.exceptions.ValidationException;
import org.eclipse.persistence.internal.security.PrivilegedAccessHelper;
import org.eclipse.persistence.internal.security.PrivilegedGetClassLoaderForClass;
@@ -75,7 +76,7 @@
String platformClass = ServerPlatformUtils.detectServerPlatform(null);
try {
detectedPlatform = ServerPlatformUtils.createServerPlatform(null, platformClass, SessionManager.class.getClassLoader());
- } catch (NullPointerException npe) {
+ } catch (ServerPlatformException npe) {
//some platforms may not be handling 'null' session well,
//so be defensive here and only log throwable here
detectedPlatform = null;
