geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r566694 - in /geronimo/server: branches/2.0/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/logmanager/ trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/...
Date Thu, 16 Aug 2007 12:58:05 GMT
Author: vamsic007
Date: Thu Aug 16 05:58:04 2007
New Revision: 566694

URL: http://svn.apache.org/viewvc?view=rev&rev=566694
Log:
GERONIMO-3390 Server Logs portlet - Web Access Log Viewer is broken
  o Fixed the problem: "When date fields are empty, whether or not ignoreDates is checked,
all search criteria are ignored."

Modified:
    geronimo/server/branches/2.0/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java

Modified: geronimo/server/branches/2.0/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java?view=diff&rev=566694&r1=566693&r2=566694
==============================================================================
--- geronimo/server/branches/2.0/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java
(original)
+++ geronimo/server/branches/2.0/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java
Thu Aug 16 05:58:04 2007
@@ -164,9 +164,10 @@
         String toDateStr = criteria.toDate;
 
         Calendar cal1 = Calendar.getInstance(), cal2 = Calendar.getInstance();
-        // If not all dates were passed we assume than no fields were passed and just
-        // filter on the current date.
-        if(fromDateStr == null || toDateStr == null) {
+        // If not all dates were passed and ignoreDates is not enabled, filter on the current
date.
+        // Note: This happens only when the portlet is loaded for the first time. Subsequent
invocation (other than
+        // using "Refresh") will have either ignoreDates enabled or both the dates non null.
+        if((fromDateStr == null || toDateStr == null) && !criteria.ignoreDates) {
             // just keep the month date and year
             cal1.set(Calendar.MILLISECOND, 0);
             cal1.set(Calendar.MINUTE, 0);

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java?view=diff&rev=566694&r1=566693&r2=566694
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java
(original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java
Thu Aug 16 05:58:04 2007
@@ -164,9 +164,10 @@
         String toDateStr = criteria.toDate;
 
         Calendar cal1 = Calendar.getInstance(), cal2 = Calendar.getInstance();
-        // If not all dates were passed we assume than no fields were passed and just
-        // filter on the current date.
-        if(fromDateStr == null || toDateStr == null) {
+        // If not all dates were passed and ignoreDates is not enabled, filter on the current
date.
+        // Note: This happens only when the portlet is loaded for the first time. Subsequent
invocation (other than
+        // using "Refresh") will have either ignoreDates enabled or both the dates non null.
+        if((fromDateStr == null || toDateStr == null) && !criteria.ignoreDates) {
             // just keep the month date and year
             cal1.set(Calendar.MILLISECOND, 0);
             cal1.set(Calendar.MINUTE, 0);



Mime
View raw message