BroadleafCommerce#935 - If a sandbox is being cleared from scope, we need to reset the SystemTime to not use a hard-coded time in that same request.

bpolster · bpolster · commit 784e1140cb79 · 2015-05-27T18:45:54.000-05:00
diff --git a/common/src/main/java/org/broadleafcommerce/common/web/BroadleafSandBoxResolverImpl.java b/common/src/main/java/org/broadleafcommerce/common/web/BroadleafSandBoxResolverImpl.java
@@ -138,6 +138,7 @@ public SandBox resolveSandBox(WebRequest request, Site site) {
                     request.removeAttribute(SANDBOX_DATE_TIME_VAR, WebRequest.SCOPE_GLOBAL_SESSION);
                     request.removeAttribute(SANDBOX_ID_VAR, WebRequest.SCOPE_GLOBAL_SESSION);
                 }
+                SystemTime.resetLocalTimeSource();
             }
             if (sandboxId != null) {
                 if (previousSandBoxId != null && !previousSandBoxId.equals(sandboxId)) {

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,7 @@ public SandBox resolveSandBox(WebRequest request, Site site) {`
`138`	`138`	`request.removeAttribute(SANDBOX_DATE_TIME_VAR, WebRequest.SCOPE_GLOBAL_SESSION);`
`139`	`139`	`request.removeAttribute(SANDBOX_ID_VAR, WebRequest.SCOPE_GLOBAL_SESSION);`
`140`	`140`	`}`
	`141`	`+ SystemTime.resetLocalTimeSource();`
`141`	`142`	`}`
`142`	`143`	`if (sandboxId != null) {`
`143`	`144`	`if (previousSandBoxId != null && !previousSandBoxId.equals(sandboxId)) {`