svn commit: r1524197 - in /oozie/trunk: core/src/main/java/org/apache/oozie/util/ZKUtils.java core/src/main/resources/oozie-default.xml docs/src/site/twiki/AG_Install.twiki release-log.txt

[rk...@apache.org]

Author: rkanter
Date: Tue Sep 17 19:58:59 2013
New Revision: 1524197

URL: http://svn.apache.org/r1524197
Log:
OOZIE-1540 When oozie.zookeeper.oozie.id is not specified, its using a space instead of the hostname (rkanter)

Modified:
    oozie/trunk/core/src/main/java/org/apache/oozie/util/ZKUtils.java
    oozie/trunk/core/src/main/resources/oozie-default.xml
    oozie/trunk/docs/src/site/twiki/AG_Install.twiki
    oozie/trunk/release-log.txt

Modified: oozie/trunk/core/src/main/java/org/apache/oozie/util/ZKUtils.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/util/ZKUtils.java?rev=1524197&r1=1524196&r2=1524197&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/util/ZKUtils.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/util/ZKUtils.java Tue Sep 17 19:58:59 2013
@@ -88,7 +88,10 @@ public class ZKUtils {
      */
     private ZKUtils() throws Exception {
         log = XLog.getLog(getClass());
-        zkId = Services.get().getConf().get(ZK_ID, System.getProperty("oozie.http.hostname"));
+        zkId = Services.get().getConf().get(ZK_ID, "").trim();
+        if (zkId.length() == 0) {
+            zkId = System.getProperty("oozie.http.hostname");
+        }
         createClient();
         advertiseService();
     }

Modified: oozie/trunk/core/src/main/resources/oozie-default.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/resources/oozie-default.xml?rev=1524197&r1=1524196&r2=1524197&view=diff
==============================================================================
--- oozie/trunk/core/src/main/resources/oozie-default.xml (original)
+++ oozie/trunk/core/src/main/resources/oozie-default.xml Tue Sep 17 19:58:59 2013
@@ -1948,10 +1948,10 @@
 
     <property>
         <name>oozie.zookeeper.oozie.id</name>
-        <value> </value>
+        <value></value>
         <description>
             The ID for the Oozie server to use.  Each Oozie server must have a unique ID.
-            If blank, Oozie will use the hostname.
+            If empty, Oozie will use the hostname.
         </description>
     </property>
 

Modified: oozie/trunk/docs/src/site/twiki/AG_Install.twiki
URL: http://svn.apache.org/viewvc/oozie/trunk/docs/src/site/twiki/AG_Install.twiki?rev=1524197&r1=1524196&r2=1524197&view=diff
==============================================================================
--- oozie/trunk/docs/src/site/twiki/AG_Install.twiki (original)
+++ oozie/trunk/docs/src/site/twiki/AG_Install.twiki Tue Sep 17 19:58:59 2013
@@ -766,12 +766,12 @@ are multiple Oozie setups each doing the
 </verbatim>
 
 The ID for the Oozie server to use when talking to ZooKeeper and other Oozie servers.  Each Oozie server must have a unique ID.  If
-blank, Oozie will use the hostname.
+empty, Oozie will use the hostname.
 
 <verbatim>
 <property>
     <name>oozie.zookeeper.oozie.id</name>
-    <value> </value>
+    <value></value>
 </property>
 </verbatim>
 

Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1524197&r1=1524196&r2=1524197&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Tue Sep 17 19:58:59 2013
@@ -1,5 +1,6 @@
 -- Oozie 4.1.0 release (trunk - unreleased)
 
+OOZIE-1540 When oozie.zookeeper.oozie.id is not specified, its using a space instead of the hostname (rkanter)
 OOZIE-1509 Do not preload all tabs in Oozie UI and make Active Jobs default (mona)
 OOZIE-1496 Oozie demo and streaming examples fails to run on Windows (eshevchuk via rkanter)
 OOZIE-1462 Compress lob columns before storing in database (virag)