You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/03/29 01:37:52 UTC
svn commit: r159332 - in incubator/beehive/trunk/netui/src: compiler/org/apache/beehive/netui/compiler/typesystem/impl/env/MessagerImpl.java pageflow/org/apache/beehive/netui/pageflow/DefaultServletContainerAdapter.java

Author: rich
Date: Mon Mar 28 15:37:50 2005
New Revision: 159332

URL: http://svn.apache.org/viewcvs?view=rev&rev=159332
Log:
Fixes for:
    - http://issues.apache.org/jira/browse/BEEHIVE-471 : NPE when incrementally building a page flow that inherits from another
    - http://issues.apache.org/jira/browse/BEEHIVE-462 : DefaultServletContainerAdapter looking for beehive.produtionmode property

tests: netui bvt (WinXP)
BB: self (linux)


Modified:
    incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/env/MessagerImpl.java
    incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServletContainerAdapter.java

Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/env/MessagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/env/MessagerImpl.java?view=diff&r1=159331&r2=159332
==============================================================================
--- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/env/MessagerImpl.java (original)
+++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/env/MessagerImpl.java Mon Mar 28 15:37:50 2005
@@ -42,9 +42,15 @@
 
     public void printError( SourcePosition sourcePosition, String s )
     {
-        assert sourcePosition != null;
-        assert sourcePosition instanceof SourcePositionImpl : sourcePosition.getClass().getName();
-        getDelegate().printError( ( ( SourcePositionImpl ) sourcePosition ).getDelegate(), s );
+        if ( sourcePosition != null )
+        {
+            assert sourcePosition instanceof SourcePositionImpl : sourcePosition.getClass().getName();
+            getDelegate().printError( ( ( SourcePositionImpl ) sourcePosition ).getDelegate(), s );
+        }
+        else
+        {
+            getDelegate().printError( s );
+        }
     }
 
     public void printWarning( String s )
@@ -54,9 +60,15 @@
 
     public void printWarning( SourcePosition sourcePosition, String s )
     {
-        assert sourcePosition != null;
-        assert sourcePosition instanceof SourcePositionImpl : sourcePosition.getClass().getName();
-        getDelegate().printWarning( ( ( SourcePositionImpl ) sourcePosition ).getDelegate(), s );
+        if ( sourcePosition != null )
+        {
+            assert sourcePosition instanceof SourcePositionImpl : sourcePosition.getClass().getName();
+            getDelegate().printWarning( ( ( SourcePositionImpl ) sourcePosition ).getDelegate(), s );
+        }
+        else
+        {
+            getDelegate().printWarning( s );
+        }
     }
 
     public void printNotice( String s )

Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServletContainerAdapter.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServletContainerAdapter.java?view=diff&r1=159331&r2=159332
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServletContainerAdapter.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServletContainerAdapter.java Mon Mar 28 15:37:50 2005
@@ -46,7 +46,7 @@
     
     static
     {
-        String productionModeFlag = System.getProperty( "beehive.produtionmode" );
+        String productionModeFlag = System.getProperty( "beehive.productionmode" );
         
         if ( productionModeFlag != null )
         {