From 11ed4cbc5e0273e488cf2abe316bd0d7a230554a Mon Sep 17 00:00:00 2001
From: AlexisDrogoul <alexis.drogoul@gmail.com>
Date: Sat, 31 Jul 2021 16:35:14 +0700
Subject: [PATCH] Prevents a possible NPE in RandomUtils

---
 msi.gama.core/src/msi/gama/common/util/RandomUtils.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/msi.gama.core/src/msi/gama/common/util/RandomUtils.java b/msi.gama.core/src/msi/gama/common/util/RandomUtils.java
index 3bcfc988fa..38bef04ac7 100644
--- a/msi.gama.core/src/msi/gama/common/util/RandomUtils.java
+++ b/msi.gama.core/src/msi/gama/common/util/RandomUtils.java
@@ -82,9 +82,9 @@ public void setState(final State state) {
 	 * Inits the generator.
 	 */
 	private void initGenerator() {
-		if (generatorName.equals(IKeyword.CELLULAR)) {
+		if (IKeyword.CELLULAR.equals(generatorName)) {
 			generator = new CellularAutomatonRNG(this);
-		} else if (generatorName.equals(IKeyword.JAVA)) {
+		} else if (IKeyword.JAVA.equals(generatorName)) {
 			generator = new JavaRNG(this);
 		} else {
 			/* By default */
@@ -240,6 +240,7 @@ public void setGenerator(final String newGen, final boolean init) {
 	// }
 
 	public void shuffleInPlace(final Collection list) {
+		if (list == null) return;
 		final int size = list.size();
 		if (size < 2) return;
 		final Object[] a = list.toArray(new Object[size]);