From 6f9d79d8e43353d1a1c01b1bd92dccf5e2c21bad Mon Sep 17 00:00:00 2001
From: Ittiam Insite <admin@ittiaminsite.com>
Date: Mon, 26 Feb 2018 16:16:54 +0530
Subject: [PATCH] Fix for SHIRO-621: REST filter bypassing matched path

---
 support/guice/pom.xml                                          | 1 +
 .../main/java/org/apache/shiro/guice/web/ShiroWebModule.java   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/support/guice/pom.xml b/support/guice/pom.xml
index 159058ccfa..53fa6bd442 100644
--- a/support/guice/pom.xml
+++ b/support/guice/pom.xml
@@ -29,6 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>shiro-guice</artifactId>
     <name>Apache Shiro :: Support :: Guice</name>
+    <version>1.4.0-ittiaminsite</version>
     <packaging>bundle</packaging>
 
     <dependencies>
diff --git a/support/guice/src/main/java/org/apache/shiro/guice/web/ShiroWebModule.java b/support/guice/src/main/java/org/apache/shiro/guice/web/ShiroWebModule.java
index ea389e20be..aac1394626 100644
--- a/support/guice/src/main/java/org/apache/shiro/guice/web/ShiroWebModule.java
+++ b/support/guice/src/main/java/org/apache/shiro/guice/web/ShiroWebModule.java
@@ -158,7 +158,8 @@ private Map<String, Key<? extends Filter>[]> setupFilterChainConfigs() {
 
                 // initialize key in filterToPathToConfig, if it doesn't exist
                 if (filterToPathToConfig.get(key) == null) {
-                    filterToPathToConfig.put((key), new HashMap<String, String>());
+                	// Fix for SHIRO-621: REST filter bypassing matched path
+                    filterToPathToConfig.put((key), new LinkedHashMap<String, String>());
                 }
                 // now set the value
                 filterToPathToConfig.get(key).put(path, config);