You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2014/03/28 14:08:36 UTC
git commit: DELTASPIKE-551 allow full deactivation of
DeltaSpikeNavigationHandler
Repository: deltaspike
Updated Branches:
refs/heads/master 89cad059f -> 380b113be
DELTASPIKE-551 allow full deactivation of DeltaSpikeNavigationHandler
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/380b113b
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/380b113b
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/380b113b
Branch: refs/heads/master
Commit: 380b113be6df4f46722a908d5908bc0a066f3751
Parents: 89cad05
Author: gpetracek <gp...@apache.org>
Authored: Fri Mar 28 14:07:53 2014 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Fri Mar 28 14:07:53 2014 +0100
----------------------------------------------------------------------
.../jsf/impl/navigation/DeltaSpikeNavigationHandler.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/380b113b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/DeltaSpikeNavigationHandler.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/DeltaSpikeNavigationHandler.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/DeltaSpikeNavigationHandler.java
index f17b992..d38a631 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/DeltaSpikeNavigationHandler.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/DeltaSpikeNavigationHandler.java
@@ -101,6 +101,11 @@ public class DeltaSpikeNavigationHandler extends ConfigurableNavigationHandler i
{
if (this.wrapped instanceof ConfigurableNavigationHandler)
{
+ if (!this.activated)
+ {
+ return ((ConfigurableNavigationHandler)this.wrapped).getNavigationCase(context, action, outcome);
+ }
+
if (action == null && outcome != null && outcome.contains(".") && outcome.startsWith("class ") &&
!otherOutcomes.contains(outcome))
{
@@ -174,6 +179,11 @@ public class DeltaSpikeNavigationHandler extends ConfigurableNavigationHandler i
result = new HashMap<String, Set<NavigationCase>>();
}
+ if (!this.activated)
+ {
+ return result;
+ }
+
return new NavigationCaseMapWrapper(result, this.wrapped);
}
}