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 2019/08/12 20:08:20 UTC
[deltaspike] branch master updated (4cfb466 -> 8936f92)
This is an automated email from the ASF dual-hosted git repository.
gpetracek pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git.
from 4cfb466 fixed build on Maven 3.6 (MNG-6649)
new 8cc7988 DELTASPIKE-1385 added support for init under high load
new 752a4a5 DELTASPIKE-1385 added support for init under high load
new 8936f92 DELTASPIKE-1385 added support for init under high load
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/deltaspike/core/util/ProjectStageProducer.java | 7 ++++---
.../beanvalidation/impl/CDIAwareConstraintValidatorFactory.java | 2 +-
.../deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java | 3 ++-
.../config/view/DefaultErrorViewAwareExceptionHandlerWrapper.java | 2 +-
.../config/view/navigation/ViewConfigAwareNavigationHandler.java | 5 +++--
.../jsf/impl/listener/phase/DeltaSpikePhaseListener.java | 7 ++++++-
.../jsf/impl/navigation/NavigationHandlerAwareApplication.java | 4 ++--
.../deltaspike/jsf/impl/security/SecurityAwareViewHandler.java | 7 ++++++-
8 files changed, 25 insertions(+), 12 deletions(-)
[deltaspike] 03/03: DELTASPIKE-1385 added support for init under
high load
Posted by gp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gpetracek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git
commit 8936f921f39d270ecd5cc762d92c0b66f579b61d
Author: gpetracek <gp...@apache.org>
AuthorDate: Mon Aug 12 21:45:31 2019 +0200
DELTASPIKE-1385 added support for init under high load
---
.../deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java | 3 ++-
.../config/view/DefaultErrorViewAwareExceptionHandlerWrapper.java | 2 +-
.../config/view/navigation/ViewConfigAwareNavigationHandler.java | 5 +++--
.../jsf/impl/listener/phase/DeltaSpikePhaseListener.java | 7 ++++++-
.../jsf/impl/navigation/NavigationHandlerAwareApplication.java | 4 ++--
.../deltaspike/jsf/impl/security/SecurityAwareViewHandler.java | 7 ++++++-
6 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java
index b0f3175..92c1d89 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java
@@ -127,8 +127,9 @@ public class WindowIdHtmlRenderer extends Renderer
if (clientWindow == null)
{
clientWindowConfig = BeanProvider.getContextualReference(ClientWindowConfig.class);
- clientWindow = BeanProvider.getContextualReference(ClientWindow.class);
maxWindowIdLength = ClientWindowHelper.getMaxWindowIdLength();
+
+ clientWindow = BeanProvider.getContextualReference(ClientWindow.class);
}
}
}
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultErrorViewAwareExceptionHandlerWrapper.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultErrorViewAwareExceptionHandlerWrapper.java
index 33af77f..f6f97fb 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultErrorViewAwareExceptionHandlerWrapper.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultErrorViewAwareExceptionHandlerWrapper.java
@@ -43,7 +43,7 @@ public class DefaultErrorViewAwareExceptionHandlerWrapper extends ExceptionHandl
{
private ExceptionHandler wrapped;
- private ViewNavigationHandler viewNavigationHandler;
+ private volatile ViewNavigationHandler viewNavigationHandler;
/**
* Constructor used by proxy libs
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/ViewConfigAwareNavigationHandler.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/ViewConfigAwareNavigationHandler.java
index a3171f8..0bc189f 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/ViewConfigAwareNavigationHandler.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/ViewConfigAwareNavigationHandler.java
@@ -48,7 +48,7 @@ public class ViewConfigAwareNavigationHandler extends NavigationHandler
private final NavigationHandler navigationHandler;
- private BeanManager beanManager;
+ private volatile BeanManager beanManager;
private NavigationParameterContext navigationParameterContext;
@@ -259,11 +259,12 @@ public class ViewConfigAwareNavigationHandler extends NavigationHandler
{
if (this.beanManager == null)
{
- this.beanManager = BeanManagerProvider.getInstance().getBeanManager();
this.navigationParameterContext =
BeanProvider.getContextualReference(NavigationParameterContext.class);
this.viewConfigResolver =
BeanProvider.getContextualReference(ViewConfigResolver.class);
+
+ this.beanManager = BeanManagerProvider.getInstance().getBeanManager();
}
}
}
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/DeltaSpikePhaseListener.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/DeltaSpikePhaseListener.java
index adda43a..7f1c062 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/DeltaSpikePhaseListener.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/DeltaSpikePhaseListener.java
@@ -52,7 +52,7 @@ public class DeltaSpikePhaseListener implements PhaseListener, Deactivatable
private final PhaseListener jsfRequestLifecyclePhaseListener = new JsfRequestLifecyclePhaseListener();
- private ViewConfigResolver viewConfigResolver;
+ private volatile ViewConfigResolver viewConfigResolver;
public DeltaSpikePhaseListener()
{
@@ -154,6 +154,11 @@ public class DeltaSpikePhaseListener implements PhaseListener, Deactivatable
private synchronized void lazyInit()
{
+ if (this.viewConfigResolver != null)
+ {
+ return;
+ }
+
this.securityModuleActivated =
BeanProvider.getContextualReference(EditableAccessDecisionVoterContext.class, true) != null;
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/NavigationHandlerAwareApplication.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/NavigationHandlerAwareApplication.java
index 6393914..b622703 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/NavigationHandlerAwareApplication.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/NavigationHandlerAwareApplication.java
@@ -31,7 +31,7 @@ import java.lang.reflect.Constructor;
public class NavigationHandlerAwareApplication extends ApplicationWrapper implements Deactivatable
{
- private static Boolean manualNavigationHandlerWrapperMode;
+ private static volatile Boolean manualNavigationHandlerWrapperMode;
private static Class navigationHandlerWrapperClass;
private final Application wrapped;
@@ -108,7 +108,7 @@ public class NavigationHandlerAwareApplication extends ApplicationWrapper implem
try
{
Constructor deltaSpikeNavigationHandlerWrapperConstructor =
- this.navigationHandlerWrapperClass.getConstructor(ConfigurableNavigationHandler.class);
+ navigationHandlerWrapperClass.getConstructor(ConfigurableNavigationHandler.class);
NavigationHandler navigationHandlerWrapper =
(NavigationHandler)deltaSpikeNavigationHandlerWrapperConstructor.newInstance(handler);
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/security/SecurityAwareViewHandler.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/security/SecurityAwareViewHandler.java
index 7d5115f..6fb44ee 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/security/SecurityAwareViewHandler.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/security/SecurityAwareViewHandler.java
@@ -46,7 +46,7 @@ public class SecurityAwareViewHandler extends ViewHandlerWrapper implements Deac
protected final ViewHandler wrapped;
private final boolean activated;
- private Boolean securityModuleActivated;
+ private volatile Boolean securityModuleActivated;
/**
* Constructor for wrapping the given {@link ViewHandler}
@@ -184,6 +184,11 @@ public class SecurityAwareViewHandler extends ViewHandlerWrapper implements Deac
private synchronized void lazyInit()
{
+ if (this.securityModuleActivated != null)
+ {
+ return;
+ }
+
this.securityModuleActivated =
BeanProvider.getContextualReference(EditableAccessDecisionVoterContext.class, true) != null;
[deltaspike] 01/03: DELTASPIKE-1385 added support for init under
high load
Posted by gp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gpetracek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git
commit 8cc79884c6e2d0490eaa3a3c69dc6d0073973783
Author: gpetracek <gp...@apache.org>
AuthorDate: Mon Aug 12 21:42:04 2019 +0200
DELTASPIKE-1385 added support for init under high load
---
.../java/org/apache/deltaspike/core/util/ProjectStageProducer.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
index 6a2e216..33f3dca 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
@@ -72,7 +72,7 @@ public class ProjectStageProducer implements Serializable
/**
* The detected ProjectStage
*/
- private static ProjectStage projectStage;
+ private static volatile ProjectStage projectStage;
/**
* for the singleton factory
@@ -134,9 +134,10 @@ public class ProjectStageProducer implements Serializable
return;
}
- projectStageProducer = new ProjectStageProducer();
+ ProjectStageProducer newProjectStageProducer = new ProjectStageProducer();
+ newProjectStageProducer.initProjectStage();
- projectStageProducer.initProjectStage();
+ projectStageProducer = newProjectStageProducer;
}
/**
[deltaspike] 02/03: DELTASPIKE-1385 added support for init under
high load
Posted by gp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gpetracek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git
commit 752a4a57fa79a939dc1713d4c8bbc83b3fc6df5e
Author: gpetracek <gp...@apache.org>
AuthorDate: Mon Aug 12 21:43:38 2019 +0200
DELTASPIKE-1385 added support for init under high load
---
.../beanvalidation/impl/CDIAwareConstraintValidatorFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/deltaspike/modules/bean-validation/impl/src/main/java/org/apache/deltaspike/beanvalidation/impl/CDIAwareConstraintValidatorFactory.java b/deltaspike/modules/bean-validation/impl/src/main/java/org/apache/deltaspike/beanvalidation/impl/CDIAwareConstraintValidatorFactory.java
index e0f21b8..d5ec4a9 100644
--- a/deltaspike/modules/bean-validation/impl/src/main/java/org/apache/deltaspike/beanvalidation/impl/CDIAwareConstraintValidatorFactory.java
+++ b/deltaspike/modules/bean-validation/impl/src/main/java/org/apache/deltaspike/beanvalidation/impl/CDIAwareConstraintValidatorFactory.java
@@ -37,7 +37,7 @@ public class CDIAwareConstraintValidatorFactory implements
ConstraintValidatorFactory
{
private static final String RELEASE_INSTANCE_METHOD_NAME = "releaseInstance";
- private static Boolean releaseInstanceMethodFound;
+ private static volatile Boolean releaseInstanceMethodFound;
private static Method releaseInstanceMethod;
private final Logger log = Logger