TASK: Check type of __fulltextParts to ensure it is always a hash map

Torsten85 · Torsten85 · commit 487dccdf3efc · 2017-05-15T16:36:14.000+02:00
diff --git a/Classes/Driver/Version1/IndexerDriver.php b/Classes/Driver/Version1/IndexerDriver.php
@@ -114,7 +114,7 @@ public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, $targe
             [
                 // first, update the __fulltextParts, then re-generate the __fulltext from all __fulltextParts
                 'script' => '
-                    if (!ctx._source.containsKey("__fulltextParts")) {
+                    if (!(ctx._source.containsKey("__fulltextParts") && ctx._source.__fulltextParts instanceof HashMap)) {
                         ctx._source.__fulltextParts = new LinkedHashMap();
                     }
 
diff --git a/Classes/Driver/Version2/IndexerDriver.php b/Classes/Driver/Version2/IndexerDriver.php
@@ -124,7 +124,7 @@ public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, $targe
                     'inline' => '
                         ctx._source.__fulltext = new HashMap();
                         
-                        if (!ctx._source.containsKey("__fulltextParts")) {
+                        if (!(ctx._source.containsKey("__fulltextParts") && ctx._source.__fulltextParts instanceof HashMap)) {
                             ctx._source.__fulltextParts = new HashMap();
                         }
                         

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, $targe`
`114`	`114`	`[`
`115`	`115`	`// first, update the __fulltextParts, then re-generate the __fulltext from all __fulltextParts`
`116`	`116`	`'script' => '`
`117`		`- if (!ctx._source.containsKey("__fulltextParts")) {`
	`117`	`+ if (!(ctx._source.containsKey("__fulltextParts") && ctx._source.__fulltextParts instanceof HashMap)) {`
`118`	`118`	`ctx._source.__fulltextParts = new LinkedHashMap();`
`119`	`119`	`}`
`120`	`120`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, $targe`
`124`	`124`	`'inline' => '`
`125`	`125`	`ctx._source.__fulltext = new HashMap();`
`126`	`126`
`127`		`- if (!ctx._source.containsKey("__fulltextParts")) {`
	`127`	`+ if (!(ctx._source.containsKey("__fulltextParts") && ctx._source.__fulltextParts instanceof HashMap)) {`
`128`	`128`	`ctx._source.__fulltextParts = new HashMap();`
`129`	`129`	`}`
`130`	`130`