Issue #540 - Fixed all instances where the typo occured occurred.

jpwsutton · jpwsutton · commit dfca9768a207 · 2018-05-11T16:21:54.000+01:00
Signed-off-by: James Sutton &lt;james.sutton@uk.ibm.com&gt;
diff --git a/org.eclipse.paho.client.mqttv3/src/main/java-templates/org/eclipse/paho/client/mqttv3/internal/ClientComms.java b/org.eclipse.paho.client.mqttv3/src/main/java-templates/org/eclipse/paho/client/mqttv3/internal/ClientComms.java
@@ -697,7 +697,7 @@ public void run() {
 
 			try {
 				// Reset an exception on existing delivery tokens.
-				// This will have been set if disconnect occured before delivery was
+				// This will have been set if disconnect occurred before delivery was
 				// fully processed.
 				MqttDeliveryToken[] toks = tokenStore.getOutstandingDelTokens();
 				for (int i=0; i<toks.length; i++) {
diff --git a/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/DisconnectedMessageBuffer.java b/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/DisconnectedMessageBuffer.java
@@ -110,7 +110,7 @@ public void run() {
 				deleteMessage(0);
 				} catch (MqttException ex) {
 					// Error occurred attempting to publish buffered message likely because the client is not connected
-					// @TRACE 517=Error occured attempting to publish buffered message due to disconnect.
+					// @TRACE 517=Error occurred attempting to publish buffered message due to disconnect.
 					log.warning(CLASS_NAME, methodName, "517");
 					break;
 				}
diff --git a/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/persist/MqttDefaultFilePersistence.java b/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/persist/MqttDefaultFilePersistence.java
@@ -266,7 +266,7 @@ private boolean isSafeChar(char c) {
 	 * Identifies any backup files in the specified directory and restores them
 	 * to their original file. This will overwrite any existing file of the same
 	 * name. This is safe as a stray backup file will only exist if a problem
-	 * occured whilst writing to the original file.
+	 * occurred whilst writing to the original file.
 	 * @param dir The directory in which to scan and restore backups
 	 */
 	private void restoreBackups(File dir) throws MqttPersistenceException {
diff --git a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/MqttAsyncClient.java b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/MqttAsyncClient.java
@@ -1702,7 +1702,7 @@ public void disconnected(MqttDisconnectResponse disconnectResponse) {
 			}
 		}
 
-		public void mqttErrorOccured(MqttException exception) {
+		public void mqttErrorOccurred(MqttException exception) {
 		}
 
 		public void authPacketArrived(int reasonCode, MqttProperties properties) {
diff --git a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/MqttCallback.java b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/MqttCallback.java
@@ -52,7 +52,7 @@ public interface MqttCallback {
 	 * @param exception
 	 *            - The exception thrown causing the error.
 	 */
-	public void mqttErrorOccured(MqttException exception);
+	public void mqttErrorOccurred(MqttException exception);
 
 	/**
 	 * This method is called when a message arrives from the server.
diff --git a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/ClientComms.java b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/ClientComms.java
@@ -775,7 +775,7 @@ public void run() {
 
 			try {
 				// Reset an exception on existing delivery tokens.
-				// This will have been set if disconnect occured before delivery was
+				// This will have been set if disconnect occurred before delivery was
 				// fully processed.
 				MqttDeliveryToken[] toks = tokenStore.getOutstandingDelTokens();
 				for (int i = 0; i < toks.length; i++) {
diff --git a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/ClientState.java b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/ClientState.java
@@ -1136,7 +1136,7 @@ protected void notifyReceivedMsg(MqttWireMessage message) throws MqttException {
 								new Object[] { Integer.valueOf(this.mqttSession.getIncomingTopicAliasMax()),
 										Integer.valueOf(incomingTopicAlias) });
 						if (callback != null) {
-							callback.mqttErrorOccured(new MqttException(MqttException.REASON_CODE_INVALID_TOPIC_ALAS));
+							callback.mqttErrorOccurred(new MqttException(MqttException.REASON_CODE_INVALID_TOPIC_ALAS));
 						}
 						throw new MqttException(MqttClientException.REASON_CODE_INVALID_TOPIC_ALAS);
 
diff --git a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/CommsCallback.java b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/CommsCallback.java
@@ -404,11 +404,11 @@ public void authMessageReceived(MqttAuth authMessage) {
 	 *            The exception that was thrown containing the cause for
 	 *            disconnection.
 	 */
-	public void mqttErrorOccured(MqttException exception) {
-		final String methodName = "mqttErrorOccured";
+	public void mqttErrorOccurred(MqttException exception) {
+		final String methodName = "mqttErrorOccurred";
 		log.warning(CLASS_NAME, methodName, "721", new Object[] { exception.getMessage() });
 		if (mqttCallback != null) {
-			mqttCallback.mqttErrorOccured(exception);
+			mqttCallback.mqttErrorOccurred(exception);
 		}
 	}
 
diff --git a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/DisconnectedMessageBuffer.java b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/DisconnectedMessageBuffer.java
@@ -111,7 +111,7 @@ public void run() {
 				deleteMessage(0);
 				} catch (MqttException ex) {
 					// Error occurred attempting to publish buffered message likely because the client is not connected
-					// @TRACE 517=Error occured attempting to publish buffered message due to disconnect.
+					// @TRACE 517=Error occurred attempting to publish buffered message due to disconnect.
 					log.warning(CLASS_NAME, methodName, "517");
 					break;
 				}
diff --git a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/persist/MqttDefaultFilePersistence.java b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/persist/MqttDefaultFilePersistence.java
@@ -258,7 +258,7 @@ private boolean isSafeChar(char c) {
 	 * Identifies any backup files in the specified directory and restores them
 	 * to their original file. This will overwrite any existing file of the same
 	 * name. This is safe as a stray backup file will only exist if a problem
-	 * occured whilst writing to the original file.
+	 * occurred whilst writing to the original file.
 	 * @param dir The directory in which to scan and restore backups
 	 */
 	private void restoreBackups(File dir) throws MqttPersistenceException {
diff --git a/org.eclipse.paho.mqttv5.client/src/test/java/org/eclipse/paho/mqttv5/client/test/automaticReconnect/TopicAliasReconnectTest.java b/org.eclipse.paho.mqttv5.client/src/test/java/org/eclipse/paho/mqttv5/client/test/automaticReconnect/TopicAliasReconnectTest.java
@@ -149,7 +149,7 @@ public void testTopicAliasOverReconnect() throws Exception {
 			asyncClient.disconnect();
 			Assert.assertFalse(asyncClient.isConnected());
 		} catch (MqttException ex) {
-			Assert.fail("An unexpected exception occured during this test: " + ex.getMessage());
+			Assert.fail("An unexpected exception occurred during this test: " + ex.getMessage());
 		}
 	}
 
diff --git a/org.eclipse.paho.mqttv5.client/src/test/java/org/eclipse/paho/mqttv5/client/test/utilities/MqttV5Receiver.java b/org.eclipse.paho.mqttv5.client/src/test/java/org/eclipse/paho/mqttv5/client/test/utilities/MqttV5Receiver.java
@@ -461,7 +461,7 @@ public void disconnected(MqttDisconnectResponse disconnectResponse) {
 }
 
 @Override
-public void mqttErrorOccured(MqttException exception) {
+public void mqttErrorOccurred(MqttException exception) {
 	// TODO Auto-generated method stub
 	
 }
diff --git a/org.eclipse.paho.mqttv5.common/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttDataTypes.java b/org.eclipse.paho.mqttv5.common/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttDataTypes.java
@@ -164,26 +164,32 @@ public static String decodeUTF8(DataInputStream input) throws MqttException {
 	 *            the DataInputStream to decode a Variable Byte Integer From
 	 * @return a new VariableByteInteger
 	 * @throws IOException
-	 *             if an error occured whilst decoding the VBI
+	 *             if an error occurred whilst decoding the VBI
 	 */
 	public static VariableByteInteger readVariableByteInteger(DataInputStream in) throws IOException {
 		byte digit;
-		int msgLength = 0;
+		int value = 0;
 		int multiplier = 1;
 		int count = 0;
 
 		do {
 			digit = in.readByte();
 			count++;
-			msgLength += ((digit & 0x7F) * multiplier);
+			value += ((digit & 0x7F) * multiplier);
 			multiplier *= 128;
 		} while ((digit & 0x80) != 0);
+		
+		if (value < 0 || value > VARIABLE_BYTE_INT_MAX) {
+			throw new IOException("This property must be a number between 0 and " + VARIABLE_BYTE_INT_MAX);
+		}
+		
 
-		return new VariableByteInteger(msgLength, count);
+		return new VariableByteInteger(value, count);
 
 	}
 
-	public static byte[] encodeVariableByteInteger(int number) {
+	public static byte[] encodeVariableByteInteger(int number) throws IllegalArgumentException{
+		validateVariableByteInt(number);
 		int numBytes = 0;
 		long no = number;
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
diff --git a/org.eclipse.paho.mqttv5.common/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttWireMessage.java b/org.eclipse.paho.mqttv5.common/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttWireMessage.java
@@ -169,7 +169,7 @@ public boolean isMessageIdRequired() {
 	 * Create an MQTT Wire Message
 	 * 
 	 * @throws MqttException
-	 *             if an error occured whilst creating the WireMessage
+	 *             if an error occurred whilst creating the WireMessage
 	 * @param data the MqttPersistable to create the message from
 	 * @return MqttWireMessage the de-persisted message
 	 */

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public void run() {`
`110`	`110`	`deleteMessage(0);`
`111`	`111`	`} catch (MqttException ex) {`
`112`	`112`	`// Error occurred attempting to publish buffered message likely because the client is not connected`
`113`		`- // @TRACE 517=Error occured attempting to publish buffered message due to disconnect.`
	`113`	`+ // @TRACE 517=Error occurred attempting to publish buffered message due to disconnect.`
`114`	`114`	`log.warning(CLASS_NAME, methodName, "517");`
`115`	`115`	`break;`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1702,7 +1702,7 @@ public void disconnected(MqttDisconnectResponse disconnectResponse) {`
`1702`	`1702`	`}`
`1703`	`1703`	`}`
`1704`	`1704`
`1705`		`- public void mqttErrorOccured(MqttException exception) {`
	`1705`	`+ public void mqttErrorOccurred(MqttException exception) {`
`1706`	`1706`	`}`
`1707`	`1707`
`1708`	`1708`	`public void authPacketArrived(int reasonCode, MqttProperties properties) {`
Original file line number	Diff line number	Diff line change
`@@ -1136,7 +1136,7 @@ protected void notifyReceivedMsg(MqttWireMessage message) throws MqttException {`
`1136`	`1136`	`new Object[] { Integer.valueOf(this.mqttSession.getIncomingTopicAliasMax()),`
`1137`	`1137`	`Integer.valueOf(incomingTopicAlias) });`
`1138`	`1138`	`if (callback != null) {`
`1139`		`- callback.mqttErrorOccured(new MqttException(MqttException.REASON_CODE_INVALID_TOPIC_ALAS));`
	`1139`	`+ callback.mqttErrorOccurred(new MqttException(MqttException.REASON_CODE_INVALID_TOPIC_ALAS));`
`1140`	`1140`	`}`
`1141`	`1141`	`throw new MqttException(MqttClientException.REASON_CODE_INVALID_TOPIC_ALAS);`
`1142`	`1142`
Original file line number	Diff line number	Diff line change
`@@ -404,11 +404,11 @@ public void authMessageReceived(MqttAuth authMessage) {`
`404`	`404`	`* The exception that was thrown containing the cause for`
`405`	`405`	`* disconnection.`
`406`	`406`	`*/`
`407`		`- public void mqttErrorOccured(MqttException exception) {`
`408`		`- final String methodName = "mqttErrorOccured";`
	`407`	`+ public void mqttErrorOccurred(MqttException exception) {`
	`408`	`+ final String methodName = "mqttErrorOccurred";`
`409`	`409`	`log.warning(CLASS_NAME, methodName, "721", new Object[] { exception.getMessage() });`
`410`	`410`	`if (mqttCallback != null) {`
`411`		`- mqttCallback.mqttErrorOccured(exception);`
	`411`	`+ mqttCallback.mqttErrorOccurred(exception);`
`412`	`412`	`}`
`413`	`413`	`}`
`414`	`414`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public void run() {`
`111`	`111`	`deleteMessage(0);`
`112`	`112`	`} catch (MqttException ex) {`
`113`	`113`	`// Error occurred attempting to publish buffered message likely because the client is not connected`
`114`		`- // @TRACE 517=Error occured attempting to publish buffered message due to disconnect.`
	`114`	`+ // @TRACE 517=Error occurred attempting to publish buffered message due to disconnect.`
`115`	`115`	`log.warning(CLASS_NAME, methodName, "517");`
`116`	`116`	`break;`
`117`	`117`	`}`