You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2011/07/13 23:12:27 UTC
svn commit: r1146483 - in /myfaces/tobago/trunk: pom.xml
tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java
Author: bommel
Date: Wed Jul 13 21:12:25 2011
New Revision: 1146483
URL: http://svn.apache.org/viewvc?rev=1146483&view=rev
Log:
minor fixes
Modified:
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=1146483&r1=1146482&r2=1146483&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Wed Jul 13 21:12:25 2011
@@ -389,6 +389,7 @@
<artifactId>jsp-api</artifactId>
<version>2.1</version>
<optional>true</optional>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -953,7 +954,7 @@
<preparationGoals>clean install</preparationGoals>
<remoteTagging>true</remoteTagging>
<autoVersionSubmodules>true</autoVersionSubmodules>
- <waitBeforeTagging>10</waitBeforeTagging>
+ <waitBeforeTagging>20</waitBeforeTagging>
</configuration>
</plugin>
<plugin>
@@ -1468,6 +1469,7 @@
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.0</version>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
@@ -1510,6 +1512,7 @@
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.1</version>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
@@ -1552,6 +1555,7 @@
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.1</version>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
@@ -1594,6 +1598,7 @@
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.0</version>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
@@ -1648,6 +1653,7 @@
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.1</version>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
@@ -1702,6 +1708,7 @@
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.1</version>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
@@ -1756,6 +1763,7 @@
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.1</version>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java?rev=1146483&r1=1146482&r2=1146483&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java Wed Jul 13 21:12:25 2011
@@ -62,12 +62,12 @@ public class ActionListenerImpl implemen
fe = fe.getCause();
}
}
- LOG.error("Processing failed. Forwarding to error page. errorOutcome="
- + errorOutcome, e.getCause());
+ LOG.error("Processing failed. Forwarding to error page. errorOutcome=" + errorOutcome, e.getCause());
FacesContext facesContext = FacesContext.getCurrentInstance();
- FacesMessage facesMessage
- = new FacesMessage(e.getCause().toString());
- facesContext.addMessage(null, facesMessage);
+ if (e.getCause() != null) {
+ FacesMessage facesMessage = new FacesMessage(e.getCause().toString());
+ facesContext.addMessage(null, facesMessage);
+ }
UIComponent source = event.getComponent();
ActionSource actionSource = (ActionSource) source;
Application application = facesContext.getApplication();
@@ -75,10 +75,8 @@ public class ActionListenerImpl implemen
// Retrieve the NavigationHandler instance..
NavigationHandler navHandler = application.getNavigationHandler();
// Invoke nav handling..
- String navBinding =
- (null != binding) ? binding.getExpressionString() : null;
- navHandler.handleNavigation(facesContext, navBinding,
- errorOutcome);
+ String navBinding = (null != binding) ? binding.getExpressionString() : null;
+ navHandler.handleNavigation(facesContext, navBinding, errorOutcome);
// Trigger a switch to Render Response if needed
facesContext.renderResponse();
}