You are viewing a plain text version of this content. The canonical link for it is here.
Posted to lokahi-commits@incubator.apache.org by to...@apache.org on 2006/06/21 21:06:06 UTC
svn commit: r416110 - in /incubator/lokahi/lokahi/trunk/src:
java/org/apache/lokahi/httpd/api/server/Apache.java
www/Apache/Server/details.vm
Author: toback
Date: Wed Jun 21 14:06:05 2006
New Revision: 416110
URL: http://svn.apache.org/viewvc?rev=416110&view=rev
Log:
Fixed broken return.
Modified:
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/Apache.java
incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/Apache.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/Apache.java?rev=416110&r1=416109&r2=416110&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/Apache.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/Apache.java Wed Jun 21 14:06:05 2006
@@ -214,8 +214,7 @@
public static Apache getApache(int id, boolean fromCache) throws SQLException {
Apache ap = new Apache();
- ap.get(id);
- return ap;
+ return ap.get(id);
}
public static Collection<Apache> getApaches() throws SQLException {
Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm?rev=416110&r1=416109&r2=416110&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm Wed Jun 21 14:06:05 2006
@@ -22,6 +22,7 @@
#if ($request.getParameter("id"))
#set ($id = $request.getParameter("id"))
+ <!-- $id -->
#end
<div align="center" class="contentbox">
<br /><br />
@@ -41,11 +42,11 @@
#if ($id)
#set ($apache = $view.getApache($id))
#set ($ent = $apache)
+ <!-- $apache -->
<table width="95%" border="0" cellspacing="0" cellpadding="1">
<tr height="15" class="info">
<td align="left" valign="center" colspan=2 >
Apache - $!{apache.getName()}
- </b>
</td>
<td align="right">
#if ($ent)