From a192b0cdbf29994d6c16c455b01f44a5acab63bc Mon Sep 17 00:00:00 2001
From: Ryszard-Trojnacki <ryszard.trojnacki@gmail.com>
Date: Thu, 2 Apr 2015 08:23:33 +0200
Subject: [PATCH] Ability to override default datasource with java parameter.

---
 src/main/java/com/avaje/ebean/PrimaryServer.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/avaje/ebean/PrimaryServer.java b/src/main/java/com/avaje/ebean/PrimaryServer.java
index 4244dccd3..9a9d7747c 100644
--- a/src/main/java/com/avaje/ebean/PrimaryServer.java
+++ b/src/main/java/com/avaje/ebean/PrimaryServer.java
@@ -46,7 +46,13 @@ class PrimaryServer {
     if (globalProperties == null) {
       globalProperties = PropertyMap.defaultProperties();
     }
-    defaultServerName = globalProperties.getProperty("datasource.default");
+    defaultServerName = System.getProperty("datasource.default");
+    if(defaultServerName == null) {
+      defaultServerName = System.getProperty("ebean.default.datasource");
+    }
+    if(defaultServerName == null) {
+      defaultServerName = globalProperties.getProperty("datasource.default");
+    }
     if (defaultServerName == null) {
       defaultServerName = globalProperties.getProperty("ebean.default.datasource");
     }