ItemInstance detailed log NPE fixes.

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java

@@ -327,38 +327,43 @@ public final class L2ItemInstance extends L2Object
 		{
 			if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (getItem().isEquipable() || (getItem().getId() == ADENA_ID))))
 			{
-				if ((creator != null) && (reference != null))
+				if (getEnchantLevel() > 0)
 				{
-					if (getEnchantLevel() > 0)
+					_logItems.info("SETOWNER:" + String.valueOf(process) // in case of null
-					{
+						+ ", item " + getObjectId() //
-						_logItems.info("SETOWNER:" + process + ", item " + getObjectId() + ":+" + getEnchantLevel() + " " + getItem().getName() + "(" + _count + "), " + creator + ", " + reference);
+						+ ":+" + getEnchantLevel() //
-					}
+						+ " " + getItem().getName() //
-					else
+						+ "(" + _count + "), " //
-					{
+						+ String.valueOf(creator) + ", " // in case of null
-						_logItems.info("SETOWNER:" + process + ", item " + getObjectId() + ":" + getItem().getName() + "(" + _count + "), " + creator + ", " + reference);
+						+ String.valueOf(reference)); // in case of null
-					}
+				}
+				else
+				{
+					_logItems.info("SETOWNER:" + String.valueOf(process) // in case of null
+						+ ", item " + getObjectId() //
+						+ ":" + getItem().getName() //
+						+ "(" + _count + "), " //
+						+ String.valueOf(creator) + ", " // in case of null
+						+ String.valueOf(reference)); // in case of null
 				}
 			}
 		}
 		
-		if (creator != null)
+		if ((creator != null) && creator.isGM())
 		{
-			if (creator.isGM())
+			String referenceName = "no-reference";
+			if (reference instanceof L2Object)
 			{
-				String referenceName = "no-reference";
+				referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
-				if (reference instanceof L2Object)
+			}
-				{
+			else if (reference instanceof String)
-					referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
+			{
-				}
+				referenceName = (String) reference;
-				else if (reference instanceof String)
+			}
-				{
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-					referenceName = (String) reference;
+			if (Config.GMAUDIT)
-				}
+			{
-				final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+				GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName);
-				if (Config.GMAUDIT)
-				{
-					GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName);
-				}
 			}
 		}
 	}
@@ -496,38 +501,45 @@ public final class L2ItemInstance extends L2Object
 		{
 			if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID))))
 			{
-				if ((creator != null) && (reference != null))
+				if (getEnchantLevel() > 0)
 				{
-					if (getEnchantLevel() > 0)
+					_logItems.info("CHANGE:" + String.valueOf(process) // in case of null
-					{
+						+ ", item " + getObjectId() //
-						_logItems.info("CHANGE:" + process + ", item " + getObjectId() + ":+" + getEnchantLevel() + " " + getItem().getName() + "(" + _count + "), PrevCount(" + old + "), " + creator + ", " + reference);
+						+ ":+" + getEnchantLevel() //
-					}
+						+ " " + getItem().getName() //
-					else
+						+ "(" + _count + "), PrevCount(" //
-					{
+						+ String.valueOf(old) + "), " // in case of null
-						_logItems.info("CHANGE:" + process + ", item " + getObjectId() + ":" + getItem().getName() + "(" + _count + "), PrevCount(" + old + "), " + creator + ", " + reference);
+						+ String.valueOf(creator) + ", " // in case of null
-					}
+						+ String.valueOf(reference)); // in case of null
+				}
+				else
+				{
+					_logItems.info("CHANGE:" + String.valueOf(process) // in case of null
+						+ ", item " + getObjectId() //
+						+ ":" + getItem().getName() //
+						+ "(" + _count + "), PrevCount(" //
+						+ String.valueOf(old) + "), " // in case of null
+						+ String.valueOf(creator) + ", " // in case of null
+						+ String.valueOf(reference)); // in case of null
 				}
 			}
 		}
 		
-		if (creator != null)
+		if ((creator != null) && creator.isGM())
 		{
-			if (creator.isGM())
+			String referenceName = "no-reference";
+			if (reference instanceof L2Object)
 			{
-				String referenceName = "no-reference";
+				referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
-				if (reference instanceof L2Object)
+			}
-				{
+			else if (reference instanceof String)
-					referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
+			{
-				}
+				referenceName = (String) reference;
-				else if (reference instanceof String)
+			}
-				{
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-					referenceName = (String) reference;
+			if (Config.GMAUDIT)
-				}
+			{
-				final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+				GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName);
-				if (Config.GMAUDIT)
-				{
-					GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName);
-				}
 			}
 		}
 	}

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java

@@ -331,38 +331,43 @@ public final class L2ItemInstance extends L2Object
 		{
 			if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (getItem().isEquipable() || (getItem().getId() == ADENA_ID))))
 			{
-				if ((creator != null) && (reference != null))
+				if (getEnchantLevel() > 0)
 				{
-					if (getEnchantLevel() > 0)
+					_logItems.info("SETOWNER:" + String.valueOf(process) // in case of null
-					{
+						+ ", item " + getObjectId() //
-						_logItems.info("SETOWNER:" + process + ", item " + getObjectId() + ":+" + getEnchantLevel() + " " + getItem().getName() + "(" + _count + "), " + creator + ", " + reference);
+						+ ":+" + getEnchantLevel() //
-					}
+						+ " " + getItem().getName() //
-					else
+						+ "(" + _count + "), " //
-					{
+						+ String.valueOf(creator) + ", " // in case of null
-						_logItems.info("SETOWNER:" + process + ", item " + getObjectId() + ":" + getItem().getName() + "(" + _count + "), " + creator + ", " + reference);
+						+ String.valueOf(reference)); // in case of null
-					}
+				}
+				else
+				{
+					_logItems.info("SETOWNER:" + String.valueOf(process) // in case of null
+						+ ", item " + getObjectId() //
+						+ ":" + getItem().getName() //
+						+ "(" + _count + "), " //
+						+ String.valueOf(creator) + ", " // in case of null
+						+ String.valueOf(reference)); // in case of null
 				}
 			}
 		}
 		
-		if (creator != null)
+		if ((creator != null) && creator.isGM())
 		{
-			if (creator.isGM())
+			String referenceName = "no-reference";
+			if (reference instanceof L2Object)
 			{
-				String referenceName = "no-reference";
+				referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
-				if (reference instanceof L2Object)
+			}
-				{
+			else if (reference instanceof String)
-					referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
+			{
-				}
+				referenceName = (String) reference;
-				else if (reference instanceof String)
+			}
-				{
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-					referenceName = (String) reference;
+			if (Config.GMAUDIT)
-				}
+			{
-				final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+				GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName);
-				if (Config.GMAUDIT)
-				{
-					GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName);
-				}
 			}
 		}
 	}
@@ -500,38 +505,45 @@ public final class L2ItemInstance extends L2Object
 		{
 			if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID))))
 			{
-				if ((creator != null) && (reference != null))
+				if (getEnchantLevel() > 0)
 				{
-					if (getEnchantLevel() > 0)
+					_logItems.info("CHANGE:" + String.valueOf(process) // in case of null
-					{
+						+ ", item " + getObjectId() //
-						_logItems.info("CHANGE:" + process + ", item " + getObjectId() + ":+" + getEnchantLevel() + " " + getItem().getName() + "(" + _count + "), PrevCount(" + old + "), " + creator + ", " + reference);
+						+ ":+" + getEnchantLevel() //
-					}
+						+ " " + getItem().getName() //
-					else
+						+ "(" + _count + "), PrevCount(" //
-					{
+						+ String.valueOf(old) + "), " // in case of null
-						_logItems.info("CHANGE:" + process + ", item " + getObjectId() + ":" + getItem().getName() + "(" + _count + "), PrevCount(" + old + "), " + creator + ", " + reference);
+						+ String.valueOf(creator) + ", " // in case of null
-					}
+						+ String.valueOf(reference)); // in case of null
+				}
+				else
+				{
+					_logItems.info("CHANGE:" + String.valueOf(process) // in case of null
+						+ ", item " + getObjectId() //
+						+ ":" + getItem().getName() //
+						+ "(" + _count + "), PrevCount(" //
+						+ String.valueOf(old) + "), " // in case of null
+						+ String.valueOf(creator) + ", " // in case of null
+						+ String.valueOf(reference)); // in case of null
 				}
 			}
 		}
 		
-		if (creator != null)
+		if ((creator != null) && creator.isGM())
 		{
-			if (creator.isGM())
+			String referenceName = "no-reference";
+			if (reference instanceof L2Object)
 			{
-				String referenceName = "no-reference";
+				referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
-				if (reference instanceof L2Object)
+			}
-				{
+			else if (reference instanceof String)
-					referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
+			{
-				}
+				referenceName = (String) reference;
-				else if (reference instanceof String)
+			}
-				{
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-					referenceName = (String) reference;
+			if (Config.GMAUDIT)
-				}
+			{
-				final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+				GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName);
-				if (Config.GMAUDIT)
-				{
-					GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName);
-				}
 			}
 		}
 	}

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java

@@ -331,38 +331,43 @@ public final class L2ItemInstance extends L2Object
 		{
 			if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (getItem().isEquipable() || (getItem().getId() == ADENA_ID))))
 			{
-				if ((creator != null) && (reference != null))
+				if (getEnchantLevel() > 0)
 				{
-					if (getEnchantLevel() > 0)
+					_logItems.info("SETOWNER:" + String.valueOf(process) // in case of null
-					{
+						+ ", item " + getObjectId() //
-						_logItems.info("SETOWNER:" + process + ", item " + getObjectId() + ":+" + getEnchantLevel() + " " + getItem().getName() + "(" + _count + "), " + creator + ", " + reference);
+						+ ":+" + getEnchantLevel() //
-					}
+						+ " " + getItem().getName() //
-					else
+						+ "(" + _count + "), " //
-					{
+						+ String.valueOf(creator) + ", " // in case of null
-						_logItems.info("SETOWNER:" + process + ", item " + getObjectId() + ":" + getItem().getName() + "(" + _count + "), " + creator + ", " + reference);
+						+ String.valueOf(reference)); // in case of null
-					}
+				}
+				else
+				{
+					_logItems.info("SETOWNER:" + String.valueOf(process) // in case of null
+						+ ", item " + getObjectId() //
+						+ ":" + getItem().getName() //
+						+ "(" + _count + "), " //
+						+ String.valueOf(creator) + ", " // in case of null
+						+ String.valueOf(reference)); // in case of null
 				}
 			}
 		}
 		
-		if (creator != null)
+		if ((creator != null) && creator.isGM())
 		{
-			if (creator.isGM())
+			String referenceName = "no-reference";
+			if (reference instanceof L2Object)
 			{
-				String referenceName = "no-reference";
+				referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
-				if (reference instanceof L2Object)
+			}
-				{
+			else if (reference instanceof String)
-					referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
+			{
-				}
+				referenceName = (String) reference;
-				else if (reference instanceof String)
+			}
-				{
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-					referenceName = (String) reference;
+			if (Config.GMAUDIT)
-				}
+			{
-				final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+				GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName);
-				if (Config.GMAUDIT)
-				{
-					GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName);
-				}
 			}
 		}
 	}
@@ -500,38 +505,45 @@ public final class L2ItemInstance extends L2Object
 		{
 			if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID))))
 			{
-				if ((creator != null) && (reference != null))
+				if (getEnchantLevel() > 0)
 				{
-					if (getEnchantLevel() > 0)
+					_logItems.info("CHANGE:" + String.valueOf(process) // in case of null
-					{
+						+ ", item " + getObjectId() //
-						_logItems.info("CHANGE:" + process + ", item " + getObjectId() + ":+" + getEnchantLevel() + " " + getItem().getName() + "(" + _count + "), PrevCount(" + old + "), " + creator + ", " + reference);
+						+ ":+" + getEnchantLevel() //
-					}
+						+ " " + getItem().getName() //
-					else
+						+ "(" + _count + "), PrevCount(" //
-					{
+						+ String.valueOf(old) + "), " // in case of null
-						_logItems.info("CHANGE:" + process + ", item " + getObjectId() + ":" + getItem().getName() + "(" + _count + "), PrevCount(" + old + "), " + creator + ", " + reference);
+						+ String.valueOf(creator) + ", " // in case of null
-					}
+						+ String.valueOf(reference)); // in case of null
+				}
+				else
+				{
+					_logItems.info("CHANGE:" + String.valueOf(process) // in case of null
+						+ ", item " + getObjectId() //
+						+ ":" + getItem().getName() //
+						+ "(" + _count + "), PrevCount(" //
+						+ String.valueOf(old) + "), " // in case of null
+						+ String.valueOf(creator) + ", " // in case of null
+						+ String.valueOf(reference)); // in case of null
 				}
 			}
 		}
 		
-		if (creator != null)
+		if ((creator != null) && creator.isGM())
 		{
-			if (creator.isGM())
+			String referenceName = "no-reference";
+			if (reference instanceof L2Object)
 			{
-				String referenceName = "no-reference";
+				referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
-				if (reference instanceof L2Object)
+			}
-				{
+			else if (reference instanceof String)
-					referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
+			{
-				}
+				referenceName = (String) reference;
-				else if (reference instanceof String)
+			}
-				{
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-					referenceName = (String) reference;
+			if (Config.GMAUDIT)
-				}
+			{
-				final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+				GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName);
-				if (Config.GMAUDIT)
-				{
-					GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName);
-				}
 			}
 		}
 	}

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java

@@ -331,38 +331,43 @@ public final class L2ItemInstance extends L2Object
 		{
 			if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (getItem().isEquipable() || (getItem().getId() == ADENA_ID))))
 			{
-				if ((creator != null) && (reference != null))
+				if (getEnchantLevel() > 0)
 				{
-					if (getEnchantLevel() > 0)
+					_logItems.info("SETOWNER:" + String.valueOf(process) // in case of null
-					{
+						+ ", item " + getObjectId() //
-						_logItems.info("SETOWNER:" + process + ", item " + getObjectId() + ":+" + getEnchantLevel() + " " + getItem().getName() + "(" + _count + "), " + creator + ", " + reference);
+						+ ":+" + getEnchantLevel() //
-					}
+						+ " " + getItem().getName() //
-					else
+						+ "(" + _count + "), " //
-					{
+						+ String.valueOf(creator) + ", " // in case of null
-						_logItems.info("SETOWNER:" + process + ", item " + getObjectId() + ":" + getItem().getName() + "(" + _count + "), " + creator + ", " + reference);
+						+ String.valueOf(reference)); // in case of null
-					}
+				}
+				else
+				{
+					_logItems.info("SETOWNER:" + String.valueOf(process) // in case of null
+						+ ", item " + getObjectId() //
+						+ ":" + getItem().getName() //
+						+ "(" + _count + "), " //
+						+ String.valueOf(creator) + ", " // in case of null
+						+ String.valueOf(reference)); // in case of null
 				}
 			}
 		}
 		
-		if (creator != null)
+		if ((creator != null) && creator.isGM())
 		{
-			if (creator.isGM())
+			String referenceName = "no-reference";
+			if (reference instanceof L2Object)
 			{
-				String referenceName = "no-reference";
+				referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
-				if (reference instanceof L2Object)
+			}
-				{
+			else if (reference instanceof String)
-					referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
+			{
-				}
+				referenceName = (String) reference;
-				else if (reference instanceof String)
+			}
-				{
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-					referenceName = (String) reference;
+			if (Config.GMAUDIT)
-				}
+			{
-				final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+				GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName);
-				if (Config.GMAUDIT)
-				{
-					GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName);
-				}
 			}
 		}
 	}
@@ -500,38 +505,45 @@ public final class L2ItemInstance extends L2Object
 		{
 			if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID))))
 			{
-				if ((creator != null) && (reference != null))
+				if (getEnchantLevel() > 0)
 				{
-					if (getEnchantLevel() > 0)
+					_logItems.info("CHANGE:" + String.valueOf(process) // in case of null
-					{
+						+ ", item " + getObjectId() //
-						_logItems.info("CHANGE:" + process + ", item " + getObjectId() + ":+" + getEnchantLevel() + " " + getItem().getName() + "(" + _count + "), PrevCount(" + old + "), " + creator + ", " + reference);
+						+ ":+" + getEnchantLevel() //
-					}
+						+ " " + getItem().getName() //
-					else
+						+ "(" + _count + "), PrevCount(" //
-					{
+						+ String.valueOf(old) + "), " // in case of null
-						_logItems.info("CHANGE:" + process + ", item " + getObjectId() + ":" + getItem().getName() + "(" + _count + "), PrevCount(" + old + "), " + creator + ", " + reference);
+						+ String.valueOf(creator) + ", " // in case of null
-					}
+						+ String.valueOf(reference)); // in case of null
+				}
+				else
+				{
+					_logItems.info("CHANGE:" + String.valueOf(process) // in case of null
+						+ ", item " + getObjectId() //
+						+ ":" + getItem().getName() //
+						+ "(" + _count + "), PrevCount(" //
+						+ String.valueOf(old) + "), " // in case of null
+						+ String.valueOf(creator) + ", " // in case of null
+						+ String.valueOf(reference)); // in case of null
 				}
 			}
 		}
 		
-		if (creator != null)
+		if ((creator != null) && creator.isGM())
 		{
-			if (creator.isGM())
+			String referenceName = "no-reference";
+			if (reference instanceof L2Object)
 			{
-				String referenceName = "no-reference";
+				referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
-				if (reference instanceof L2Object)
+			}
-				{
+			else if (reference instanceof String)
-					referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
+			{
-				}
+				referenceName = (String) reference;
-				else if (reference instanceof String)
+			}
-				{
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-					referenceName = (String) reference;
+			if (Config.GMAUDIT)
-				}
+			{
-				final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+				GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName);
-				if (Config.GMAUDIT)
-				{
-					GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName);
-				}
 			}
 		}
 	}