From 6c37dc494bd7cc5eb63cae140211fc9f5dd3f057 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sat, 11 Apr 2015 19:40:39 +1200
Subject: [PATCH] Fix for #265 - java.lang.NoClassDefFoundError: Could not
 initialize class com.avaje.ebean.Ebean

---
 src/main/java/com/avaje/ebean/Ebean.java | 29 ++++++++++++++----------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/avaje/ebean/Ebean.java b/src/main/java/com/avaje/ebean/Ebean.java
index 9626761b2..7d21a09cf 100644
--- a/src/main/java/com/avaje/ebean/Ebean.java
+++ b/src/main/java/com/avaje/ebean/Ebean.java
@@ -152,20 +152,25 @@ public final class Ebean {
 
     private ServerManager() {
 
-      // skipDefaultServer is set by EbeanServerFactory
-      // ... when it is creating the primaryServer
-      if (PrimaryServer.isSkip()) {
-        // primary server being created by EbeanServerFactory
-        // ... so we should not try and create it here
-        logger.debug("PrimaryServer.isSkip()");
+      try {
+        // skipDefaultServer is set by EbeanServerFactory
+        // ... when it is creating the primaryServer
+        if (PrimaryServer.isSkip()) {
+          // primary server being created by EbeanServerFactory
+          // ... so we should not try and create it here
+          logger.debug("PrimaryServer.isSkip()");
 
-      } else {
-        // look to see if there is a default server defined
-        String primaryName = PrimaryServer.getPrimaryServerName();
-        logger.debug("primaryName:" + primaryName);
-        if (primaryName != null && primaryName.trim().length() > 0) {
-          primaryServer = getWithCreate(primaryName.trim());
+        } else {
+          // look to see if there is a default server defined
+          String primaryName = PrimaryServer.getPrimaryServerName();
+          logger.debug("primaryName:" + primaryName);
+          if (primaryName != null && primaryName.trim().length() > 0) {
+            primaryServer = getWithCreate(primaryName.trim());
+          }
         }
+      } catch (RuntimeException e) {
+        logger.error("Error trying to create the default EbeanServer", e);
+        throw e;
       }
     }