svn commit: r1360945 - /accumulo/trunk/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/query/Query.java

[afuchs]

Author: afuchs
Date: Thu Jul 12 21:08:23 2012
New Revision: 1360945

URL: http://svn.apache.org/viewvc?rev=1360945&view=rev
Log:
ACCUMULO-673

Modified:
    
accumulo/trunk/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/query/Query.java

Modified: 
accumulo/trunk/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/query/Query.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/query/Query.java?rev=1360945&r1=1360944&r2=1360945&view=diff
==============================================================================
--- 
accumulo/trunk/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/query/Query.java
 (original)
+++ 
accumulo/trunk/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/query/Query.java
 Thu Jul 12 21:08:23 2012
@@ -175,7 +175,7 @@ public class Query implements IQuery {
     Connector connector = null;
     if (null == instanceName || null == zooKeepers || null == username || null 
== password)
       throw new EJBException("Required parameters not set. [instanceName = " + 
this.instanceName + ", zookeepers = " + this.zooKeepers + ", username = "
-          + this.username + ", password = [hidden]. Check values in 
ejb-jar.xml");
+          + this.username + (password==null?", password = null":"") + "]. 
Check values in ejb-jar.xml");
     Instance instance = new ZooKeeperInstance(this.instanceName, 
this.zooKeepers);
     try {
       log.info("Connecting to [instanceName = " + this.instanceName + ", 
zookeepers = " + this.zooKeepers + ", username = " + this.username + "].");
@@ -208,11 +208,10 @@ public class Query implements IQuery {
     Connector connector = null;
     if (null == instanceName || null == zooKeepers || null == username || null 
== password)
       throw new EJBException("Required parameters not set. [instanceName = " + 
this.instanceName + ", zookeepers = " + this.zooKeepers + ", username = "
-          + this.username + ", password = " + this.password + "]. Check values 
in ejb-jar.xml");
+          + this.username + (password==null?", password = null":"") + "]. 
Check values in ejb-jar.xml");
     Instance instance = new ZooKeeperInstance(this.instanceName, 
this.zooKeepers);
     try {
-      log.info("Connecting to [instanceName = " + this.instanceName + ", 
zookeepers = " + this.zooKeepers + ", username = " + this.username + ", 
password = "
-          + this.password + "].");
+      log.info("Connecting to [instanceName = " + this.instanceName + ", 
zookeepers = " + this.zooKeepers + ", username = " + this.username + "].");
       connector = instance.getConnector(this.username, 
this.password.getBytes());
     } catch (Exception e) {
       throw new EJBException("Error getting connector from instance", e);