Use CompoundName.from for handler parameters too.

1 files changed, 3 insertions, 4 deletions

diff --git a/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java b/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java
index a838af263c1..837f356d4d9 100644
--- a/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java
+++ b/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java
@@ -112,7 +112,7 @@ public abstract class AbstractProcessingHandler<COMPONENT extends Processor> ext
     public HttpResponse handle(HttpRequest request, ContentChannel channel) {
         com.yahoo.processing.Request processingRequest = new com.yahoo.processing.Request();
         populate("", request.propertyMap(), processingRequest.properties());
-        populate("context", request.getJDiscRequest().context(), processingRequest.properties());
+        populate("context.", request.getJDiscRequest().context(), processingRequest.properties());
         processingRequest.properties().set(Request.JDISC_REQUEST, request);
 
         FreezeListener freezeListener = new FreezeListener(processingRequest, renderers, defaultRenderer, channel, renderingExecutor);
@@ -183,10 +183,9 @@ public abstract class AbstractProcessingHandler<COMPONENT extends Processor> ext
         return properties.getString(Request.CHAIN,"default");
     }
 
-    private void populate(String prefixName,Map<String,?> parameters,Properties properties) {
-        CompoundName prefix = new CompoundName(prefixName);
+    private void populate(String prefixName, Map<String,?> parameters,Properties properties) {
         for (Map.Entry<String,?> entry : parameters.entrySet())
-            properties.set(prefix.append(entry.getKey()), entry.getValue());
+            properties.set(CompoundName.from(prefixName + entry.getKey()), entry.getValue());
     }
 
     private static class FreezeListener implements Runnable, ResponseReceiver {