You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2010/11/19 04:45:00 UTC
svn commit: r1036728 -
/geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java
Author: xiaming
Date: Fri Nov 19 03:44:59 2010
New Revision: 1036728
URL: http://svn.apache.org/viewvc?rev=1036728&view=rev
Log:
GERONIMO-5706 fix the console exception when executing select sql statement in derby auth disabled, patch provided by viola.lu
Modified:
geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java
Modified: geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java?rev=1036728&r1=1036727&r2=1036728&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java (original)
+++ geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java Fri Nov 19 03:44:59 2010
@@ -133,8 +133,13 @@ public class RunSQLPortlet extends BaseP
}
renderRequest.setAttribute("singleSelectStmt", singleSelectStmt);
renderRequest.setAttribute("ds", DerbyConnectionUtil.getDataSource(useDB));
- renderRequest.setAttribute("userName", DerbyConnectionUtil.getDerbyConnectionUsername());
- renderRequest.setAttribute("userPassword", DerbyConnectionUtil.getDerbyConnectionUserPassword());
+ if("false".equals(System.getProperty("derby.connection.requireAuthentication"))){
+ renderRequest.setAttribute("userName", "app");
+ renderRequest.setAttribute("userPassword", "app");
+ } else {
+ renderRequest.setAttribute("userName", DerbyConnectionUtil.getDerbyConnectionUsername());
+ renderRequest.setAttribute("userPassword", DerbyConnectionUtil.getDerbyConnectionUserPassword());
+ }
}
if ((action != null) && (action.trim().length() > 0)) {
//set action to null so that subsequent renders of portlet