This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository
https://gitbox.apache.org/repos/asf/ofbiz-framework.gitThe following commit(s) were added to refs/heads/trunk by this push:
new c4b5f5e Test locally <<hooks = ['pre-push': 'checkstyleMain']>>
c4b5f5e is described below
commit c4b5f5ec2c8e9a9a82bca86648f40596522823d4
Author: Jacques Le Roux <
[hidden email]>
AuthorDate: Sat Jun 13 09:41:59 2020 +0200
Test locally <<hooks = ['pre-push': 'checkstyleMain']>>
---
build.gradle | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index edb935c..88e9fd5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -293,7 +293,7 @@ checkstyle {
showViolations = false
}
gitHooks {
- hooks = ['pre-commit': 'checkstyleMain']
+ hooks = ['pre-push': 'checkstyleMain']
}
// Eclipse plugin settings
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
index 72ee26d..8a48ca7 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
@@ -100,7 +100,7 @@ public class RequestHandler {
private RequestHandler(ServletContext context) {
// init the ControllerConfig, but don't save it anywhere, just load it into the cache
- this.controllerConfigURL = ConfigXMLReader.getControllerConfigURL(context);
+ this.controllerConfigURL = ConfigXMLReader.getControllerConfigURL(context);
try {
ConfigXMLReader.getControllerConfig(this.controllerConfigURL);
} catch (WebAppConfigurationException e) {