(jackrabbit-oak) branch trunk updated: OAK-11784 instantiate the NamespaceHelper once (#2401)

[joerghoh]

This is an automated email from the ASF dual-hosted git repository.

joerghoh pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 9123125e5a OAK-11784 instantiate the NamespaceHelper once (#2401)
9123125e5a is described below

commit 9123125e5a088e2421fc7f60c0d54f2f77595526
Author: Jörg Hoh <joerg...@users.noreply.github.com>
AuthorDate: Mon Jul 28 11:35:00 2025 +0200

    OAK-11784 instantiate the NamespaceHelper once (#2401)
    
    with JCR-5161 in place the NamespaceRegistry is retrieved once during the 
lifetime of the
    NamespaceHelper object.
---
 .../main/java/org/apache/jackrabbit/oak/jcr/xml/ImportHandler.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImportHandler.java 
b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImportHandler.java
index 37a154aee5..2262814b11 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImportHandler.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImportHandler.java
@@ -65,6 +65,7 @@ public class ImportHandler extends DefaultHandler {
     protected Locator locator;
     private TargetImportHandler targetHandler;
     private final Map<String, String> tempPrefixMap = new HashMap<String, 
String>();
+    private final NamespaceHelper namespaceHelper;
 
     public ImportHandler(String absPath, SessionContext sessionContext,
                          int uuidBehavior, boolean isWorkspaceImport) throws 
RepositoryException {
@@ -74,6 +75,7 @@ public class ImportHandler extends DefaultHandler {
         SessionDelegate sd = sessionContext.getSessionDelegate();
         root = (isWorkspaceImport) ? sd.getContentSession().getLatestRoot() : 
sd.getRoot();
         importer = new ImporterImpl(absPath, sessionContext, root, 
uuidBehavior, isWorkspaceImport);
+        namespaceHelper = new NamespaceHelper(sessionContext.getSession());
     }
 
     //---------------------------------------------------------< ErrorHandler >
@@ -136,7 +138,7 @@ public class ImportHandler extends DefaultHandler {
     public void startPrefixMapping(String prefix, String uri)
             throws SAXException {
         try {
-            new NamespaceHelper(sessionContext.getSession()).registerNamespace(
+            namespaceHelper.registerNamespace(
                     prefix, uri);
             if (targetHandler != null) {
                 targetHandler.startPrefixMapping(prefix, uri);