Merge branch 'master' into ajax-experiments

ngobjects · Nov 30, 2023 · 98e862a · 98e862a
2 parents 2c511c8 + 0416c82
commit 98e862a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ng-appserver/src/main/java/ng/appserver/NGComponentReference.java b/ng-appserver/src/main/java/ng/appserver/NGComponentReference.java
@@ -78,8 +78,8 @@ private void beforeComponent( final NGContext context ) {
 	 * Return control to the previous component
 	 */
 	private void afterComponent( final NGContext context ) {
-		context.setComponent( context.component().parent() );
 		context.component().pushBindingValuesToParent();
+		context.setComponent( context.component().parent() );
 	}
 
 	@Override

diff --git a/ng-appserver/src/main/java/ng/appserver/privates/NGResourceLoader.java b/ng-appserver/src/main/java/ng/appserver/privates/NGResourceLoader.java
@@ -166,7 +166,7 @@ public Optional<InputStream> inputStreamForResourceWithPath( String resourcePath
 				final String resourcePathForClassLoader = resourcePath.substring( 1 );
 
 				// We're using this method to locate resources, in case there's more than one resource on the classpath with the same name
-				final Enumeration<URL> resources = NGResourceLoader.class.getClassLoader().getResources( resourcePathForClassLoader );
+				final Enumeration<URL> resources = JavaClasspathResourceSource.class.getClassLoader().getResources( resourcePathForClassLoader );
 
 				// We iterate through the resources and pick the first one to return. Then we log a warning if there are more resources with the same name.
 				while( resources.hasMoreElements() ) {