myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject [myfaces-tobago] branch master updated: checkstyle
Date Fri, 01 Dec 2017 08:14:49 GMT
This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git


The following commit(s) were added to refs/heads/master by this push:
     new 6a2c6ea  checkstyle
     new 5f5aee8  Merge remote-tracking branch 'origin/master'
6a2c6ea is described below

commit 6a2c6eae3d89868c65887fd5b0153e50050d4f47
Author: Udo Schnurpfeil <lofwyr@apache.org>
AuthorDate: Fri Dec 1 09:14:40 2017 +0100

    checkstyle
---
 .../java/org/apache/myfaces/tobago/sanitizer/JsoupSanitizer.java    | 3 ++-
 .../java/org/apache/myfaces/tobago/servlet/ResourceServlet.java     | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/JsoupSanitizer.java
b/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/JsoupSanitizer.java
index cadd142..4575c13 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/JsoupSanitizer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/JsoupSanitizer.java
@@ -73,7 +73,8 @@ public class JsoupSanitizer implements Sanitizer {
               "Unknown configuration value for 'whitelist' in tobago-config.xml found! value='"
+ whitelistName + "'");
         }
       } else {
-        throw new TobagoConfigurationException("Unknown configuration key in tobago-config.xml
found! key='" + key + "'");
+        throw new TobagoConfigurationException(
+            "Unknown configuration key in tobago-config.xml found! key='" + key + "'");
       }
     }
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
b/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
index 95a1878..3bf6543 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
@@ -78,7 +78,7 @@ public class ResourceServlet extends HttpServlet {
     super.init(servletConfig);
     final TobagoConfig tobagoConfig = TobagoConfig.getInstance(servletConfig.getServletContext());
     if (tobagoConfig.getProjectStage() == ProjectStage.Production) {
-       expires = 24 * 60 * 60 * 1000L;
+      expires = 24 * 60 * 60 * 1000L;
     }
 
     final String expiresString = servletConfig.getInitParameter("expires");
@@ -101,7 +101,7 @@ public class ResourceServlet extends HttpServlet {
     nosniffHeader = tobagoConfig.isSetNosniffHeader();
   }
 
-    @Override
+  @Override
   protected void doGet(
       final HttpServletRequest request, final HttpServletResponse response)
       throws ServletException, IOException {
@@ -139,7 +139,7 @@ public class ResourceServlet extends HttpServlet {
 
   private InputStream locateResource(String resource) {
     final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-    InputStream inputStream;// meta inf (like in servlet 3.0)
+    InputStream inputStream; // meta inf (like in servlet 3.0)
     inputStream = classLoader.getResourceAsStream("META-INF/resources/" + resource);
 
     // "normal" classpath

-- 
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <commits@myfaces.apache.org>'].

Mime
View raw message