From commitsnelsonheather@example.com Wed Oct 03 15:19:33 2007
Return-Path: <commitsnelsonheather@example.com>
Delivered-To: nelsonheather@example.com
Received: (qmail 3694 invoked from network); 3 Oct 2007 15:19:31 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 3 Oct 2007 15:19:31 -0000
Received: (qmail 26625 invoked by uid 500); 3 Oct 2007 15:19:18 -0000
Delivered-To: nelsonheather@example.com
Received: (qmail 26580 invoked by uid 500); 3 Oct 2007 15:19:18 -0000
Mailing-List: contact nelsonheather@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:nelsonheather@example.com>
List-Unsubscribe: <mailto:nelsonheather@example.com>
List-Post: <mailto:nelsonheather@example.com>
List-Id: <commits.beehive.apache.org>
Reply-To: "Beehive Dev" <nelsonheather@example.com>
Delivered-To: mailing list nelsonheather@example.com
Received: (qmail 26536 invoked by uid 99); 3 Oct 2007 15:19:18 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Oct 2007 08:19:18 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Oct 2007 15:19:28 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id D96771A9832; Wed,  3 Oct 2007 08:19:07 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r581622 -
 /beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java
Date: Wed, 03 Oct 2007 15:19:07 -0000
To: nelsonheather@example.com
From: nelsonheather@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <nelsonheather@example.com>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: crogers
Date: Wed Oct  3 08:19:06 2007
New Revision: 581622

URL: http://svn.apache.org/viewvc?rev=581622&view=rev
Log:
fixed a typo in a comment.


Modified:
    beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java

Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java?rev=581622&r1=581621&r2=581622&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java (original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java Wed Oct  3 08:19:06 2007
@@ -1210,7 +1210,7 @@
         return _state.multiple;
     }
 
-    // add dthe datasource values if needed.
+    // add the datasource values if needed.
     private void addDatasourceIfNeeded(ServletRequest req)
             throws JspException
     {



From commitsnelsonheather@example.com Mon Oct 08 04:06:30 2007
Return-Path: <commitsnelsonheather@example.com>
Delivered-To: nelsonheather@example.com
Received: (qmail 6144 invoked from network); 8 Oct 2007 04:06:30 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 8 Oct 2007 04:06:30 -0000
Received: (qmail 12896 invoked by uid 500); 8 Oct 2007 04:06:18 -0000
Delivered-To: nelsonheather@example.com
Received: (qmail 12886 invoked by uid 500); 8 Oct 2007 04:06:18 -0000
Mailing-List: contact nelsonheather@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:nelsonheather@example.com>
List-Unsubscribe: <mailto:nelsonheather@example.com>
List-Post: <mailto:nelsonheather@example.com>
List-Id: <commits.beehive.apache.org>
Reply-To: "Beehive Dev" <nelsonheather@example.com>
Delivered-To: mailing list nelsonheather@example.com
Received: (qmail 12875 invoked by uid 99); 8 Oct 2007 04:06:18 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Oct 2007 21:06:18 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Oct 2007 04:06:21 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E979A1A9832; Sun,  7 Oct 2007 21:05:30 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r582706 - in /beehive/trunk/netui:
 src/compiler-core/org/apache/beehive/netui/compiler/grammar/
 test/src/compilerTests/testsuite/Jira1207/
 test/src/compilerTests/testsuite/Jira1207/Jira1207/
 test/src/compilerTests/testsuite/Jira1207/expecte...
Date: Mon, 08 Oct 2007 04:05:30 -0000
To: nelsonheather@example.com
From: nelsonheather@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <nelsonheather@example.com>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: crogers
Date: Sun Oct  7 21:05:27 2007
New Revision: 582706

URL: http://svn.apache.org/viewvc?rev=582706&view=rev
Log:
Fix and test for BEEHIVE-12207... added code to see if the additional value to check is null.

Tests: NetUI compiler tests (WinXP passed)


Added:
    beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/
    beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/
    beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/Controller.java   (with props)
    beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/index.jsp   (with props)
    beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/expectedOutput/
    beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/expectedOutput/warningsorerrors.expected   (with props)
Modified:
    beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java

Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java?rev=582706&r1=582705&r2=582706&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java Sun Oct  7 21:05:27 2007
@@ -90,7 +90,7 @@
                                 annotationArrayIndex );
             
             //
-            // Get a list of additional annotations (presumably not from the this one's parent) to check.
+            // Get a list of additional annotations (presumably not from this one's parent) to check.
             //
             List additionalAnnsToCheck = getAdditionalAnnotationsToCheck( classMember );
             
@@ -99,12 +99,17 @@
                 // Check this value against the list of additional annotations.
                 checkForDuplicates( value, valueName, parentAnnotation, classMember, additionalAnnsToCheck, true, -1 );
                 
-                // Check for duplicates *within* within the list of additional annotations.
+                // Check for duplicates *within* the list of additional annotations.
                 for ( int i = 0; i < additionalAnnsToCheck.size(); ++i )
                 {
                     AnnotationInstance ann = ( AnnotationInstance ) additionalAnnsToCheck.get( i );
                     AnnotationValue valueToCheck = CompilerUtils.getAnnotationValue( ann, valueName, true );
-                    checkForDuplicates( valueToCheck, valueName, ann, classMember, additionalAnnsToCheck, true, -1 );
+
+                    // The additional value to check could be null, but this
+                    // error would be caught in another check. 
+                    if (valueToCheck != null) {
+                        checkForDuplicates(valueToCheck, valueName, ann, classMember, additionalAnnsToCheck, true, -1);
+                    }
                 }
             }
         }

Added: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/Controller.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/Controller.java?rev=582706&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/Controller.java (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/Controller.java Sun Oct  7 21:05:27 2007
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package Jira1207;
+
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.beehive.netui.pageflow.Forward;
+
+/*
+ * Test for JIRA issue, BEEHIVE-1207, to make sure we don't have
+ * an NPE caused by the empty forward in the exception handler.
+ */
+@Jpf.Controller(
+)
+public class Controller extends PageFlowController {
+
+    @Jpf.Action(
+        catches = {
+            @Jpf.Catch(
+                type = Exception.class,
+                method = "localHandler")
+        },
+        forwards = {
+            @Jpf.Forward(name = "success", path = "index.jsp")
+        }
+    )
+    public Forward begin() {
+        Forward forward = new Forward("success");
+        return forward;
+    }
+
+    @Jpf.ExceptionHandler(
+        forwards = {
+            @Jpf.Forward()
+        }
+    )
+    protected Forward localHandler(Exception ex, String actionName,
+                                   String message, Object form)
+    {
+        return new Forward("test");
+    }
+}

Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/Controller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/index.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/index.jsp?rev=582706&view=auto
==============================================================================
    (empty)

Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/expectedOutput/warningsorerrors.expected?rev=582706&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/expectedOutput/warningsorerrors.expected Sun Oct  7 21:05:27 2007
@@ -0,0 +1,7 @@
+[LOCAL_PATH]\WEB-INF\.tmpbeansrc\Jira1207\Controller.java:53: Attribute "name" must be present.
+    protected Forward localHandler(Exception ex, String actionName,
+                      ^
+[LOCAL_PATH]\WEB-INF\.tmpbeansrc\Jira1207\Controller.java:53: At least one of attributes "path", "tilesDefinition", "returnAction", "navigateTo", or "action" must be present.
+    protected Forward localHandler(Exception ex, String actionName,
+                      ^
+2 errors

Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/expectedOutput/warningsorerrors.expected
------------------------------------------------------------------------------
    svn:eol-style = native




{'source': 'Apache Software Foundation Public Mail Archives'}