[fix] small improvements in LuceneIndexWorker

Author: line-o

extensions/indexes/lucene/src/main/java/org/exist/indexing/lucene/LuceneIndexWorker.java

@@ -1162,12 +1162,13 @@ else if (field == null) {
      */
     public static LuceneConfig getLuceneConfig(DBBroker broker, DocumentSet docs) {
         for (Iterator<Collection> i = docs.getCollectionIterator(); i.hasNext(); ) {
-            Collection collection = i.next();
-            IndexSpec idxConf = collection.getIndexConfiguration(broker);
-            if (idxConf != null) {
-                LuceneConfig config = (LuceneConfig) idxConf.getCustomIndexSpec(LuceneIndex.ID);
-                if (config != null) {
-                    return config;
+            try (Collection collection = i.next();) {
+                IndexSpec idxConf = collection.getIndexConfiguration(broker);
+                if (idxConf != null) {
+                    LuceneConfig config = (LuceneConfig) idxConf.getCustomIndexSpec(LuceneIndex.ID);
+                    if (config != null) {
+                        return config;
+                    }
                 }
             }
         }
@@ -1423,7 +1424,7 @@ private void write() {
                 // store the node id
                 int nodeIdLen = pending.nodeId.size();
                 byte[] data = new byte[nodeIdLen + 2];
-                ByteConversion.shortToByte((short) pending.nodeId.units(), data, 0);
+                ByteConversion.shortToByteH((short) pending.nodeId.units(), data, 0);
                 pending.nodeId.serialize(data, 2);
                 fNodeId.setBytesValue(data);
                 doc.add(fNodeId);
@@ -1438,10 +1439,11 @@ private void write() {
                     // the text content is indexed in a field using either
                     // the qname of the element or attribute or the field
                     // name defined in the configuration
-                    if (pending.idxConf.isNamed())
+                    if (pending.idxConf.isNamed()) {
                         contentField = pending.idxConf.getName();
-                    else
+                    } else {
                         contentField = LuceneUtil.encodeQName(pending.qname, index.getBrokerPool().getSymbols());
+                    }
 
                     Field fld = new TextField(contentField, pending.text.toString(), Field.Store.NO);
 
@@ -1454,6 +1456,7 @@ private void write() {
                 if (pending.idxConf.getAnalyzer() == null) {
                     writer.addDocument(config.facetsConfig.build(index.getTaxonomyWriter(), doc));
                 } else {
+                    // FIXME: re-enable custom analyzers again
                     LOG.warn("Custom analyzer for pending doc is not supported in Lucene 10 upgrade yet. Using default.");
                     writer.addDocument(config.facetsConfig.build(index.getTaxonomyWriter(), doc));
                 }