From 0e0fa37f0d794ddb6250f26d78776e8cd2539804 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Sat, 18 Jul 2015 07:46:42 +1200
Subject: [PATCH] #324 - ENH: Add Ebean.getDefaultServer()

---
 src/main/java/com/avaje/ebean/Ebean.java | 12 +++++++++++-
 src/main/java/com/avaje/ebean/Model.java |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/avaje/ebean/Ebean.java b/src/main/java/com/avaje/ebean/Ebean.java
index 126519503..3d5134413 100644
--- a/src/main/java/com/avaje/ebean/Ebean.java
+++ b/src/main/java/com/avaje/ebean/Ebean.java
@@ -254,12 +254,22 @@ public final class Ebean {
    * }</pre>
    * 
    * @param name
-   *          the name of the server, use null for the 'default server'
+   *          the name of the server, can use null for the 'default server'
    */
   public static EbeanServer getServer(String name) {
     return serverMgr.get(name);
   }
 
+  /**
+   * Returns the default EbeanServer.
+   * <p>
+   * This is equivalent to <code>Ebean.getServer(null);</code>
+   * </p>
+   */
+  public static EbeanServer getDefaultServer() {
+    return getServer(null);
+  }
+
   /**
    * Return the ExpressionFactory from the default server.
    * <p>
diff --git a/src/main/java/com/avaje/ebean/Model.java b/src/main/java/com/avaje/ebean/Model.java
index 6aaa19766..bdee368eb 100644
--- a/src/main/java/com/avaje/ebean/Model.java
+++ b/src/main/java/com/avaje/ebean/Model.java
@@ -152,7 +152,7 @@ public abstract class Model {
    * }</pre>
    */
   public static EbeanServer db() {
-    return Ebean.getServer(null);
+    return Ebean.getDefaultServer();
   }
 
   /**
@@ -451,8 +451,8 @@ public abstract class Model {
      * Construct passing the class literal type of the entity type.
      */
     protected Find(String serverName, Class<T> type) {
-      this.type = type;
       this.serverName = serverName;
+      this.type = type;
     }
 
     /**