[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/wbem/indications CIMIndicationHandler.java, 1.23, 1.24 ReliableIndicationHandler.java, 1.2, 1.3

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/indications
In directory vz-cvs-3.sog:/tmp/cvs-serv13439/src/org/sblim/cimclient/internal/wbem/indications

Modified Files:
	CIMIndicationHandler.java ReliableIndicationHandler.java 
Log Message:
3376657 - Get reliable indication properties once

Index: CIMIndicationHandler.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/indications/CIMIndicationHandler.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- CIMIndicationHandler.java	10 Aug 2011 11:52:13 -0000	1.23
+++ CIMIndicationHandler.java	10 Aug 2011 12:03:30 -0000	1.24
@@ -34,6 +34,7 @@
  * 3304058    2011-05-20  blaschke-oss Use same date format in change history
  * 3304953    2011-05-20  blaschke-oss Indication URL mapped to lower case
  * 3374206    2011-07-22  blaschke-oss NullPointerException caused by Indication
+ * 3376657    2011-07-24  blaschke-oss Get reliable indication properties once
  */
 
 package org.sblim.cimclient.internal.wbem.indications;
@@ -309,7 +310,8 @@
 							+ ", DeliveryRetryInterval=" + interval);
 
 			// Let ReliableIndicationHandler deliver it
-			this.iRIHandler.handleIndication(pIndication, pId, pInetAddress);
+			this.iRIHandler
+					.handleIndication(pIndication, seqCtxProp, seqNumProp, pId, pInetAddress);
 			return false;
 
 		}
@@ -335,7 +337,7 @@
 		}
 
 		// Let ReliableIndicationHandler deliver it
-		this.iRIHandler.handleIndication(pIndication, pId, pInetAddress);
+		this.iRIHandler.handleIndication(pIndication, seqCtxProp, seqNumProp, pId, pInetAddress);
 		return false;
 	}
 

Index: ReliableIndicationHandler.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/indications/ReliableIndicationHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ReliableIndicationHandler.java	4 Jun 2011 09:53:05 -0000	1.2
+++ ReliableIndicationHandler.java	10 Aug 2011 12:03:30 -0000	1.3
@@ -15,6 +15,7 @@
  * Flag       Date        Prog         Description
  *------------------------------------------------------------------------------- 
  * 3288721    2011-05-20  blaschke-oss Need the function of indication reordering
+ * 3376657    2011-07-24  blaschke-oss Get reliable indication properties once
  */
 
 package org.sblim.cimclient.internal.wbem.indications;
@@ -485,26 +486,26 @@
 	 * 
 	 * @param pIndication
 	 *            Reliable indication.
+	 * @param pSeqCtxProp
+	 *            SequenceContext property.
+	 * @param pSeqNumProp
+	 *            SequenceNumber property.
 	 * @param pId
 	 *            Path portion of reliable indication URL.
 	 * @param pInetAddress
 	 *            Host portion of reliable indication URL.
 	 */
-	public synchronized void handleIndication(CIMInstance pIndication, String pId,
-			InetAddress pInetAddress) {
+	public synchronized void handleIndication(CIMInstance pIndication, CIMProperty<?> pSeqCtxProp,
+			CIMProperty<?> pSeqNumProp, String pId, InetAddress pInetAddress) {
 		// Get current time
 		long arrivalTime = System.currentTimeMillis();
 
-		// Get reliable indication properties from indication
-		CIMProperty<?> seqCtxProp = pIndication.getProperty("SequenceContext");
-		CIMProperty<?> seqNumProp = pIndication.getProperty("SequenceNumber");
-
 		// Initial indication arrived, save knowledge about sequence identifier
 		// and deliver
 		if (this.iLastSequenceNumber == null) {
 			// Remember sequence context/number and arrival time
-			this.iLastSequenceContext = (String) seqCtxProp.getValue();
-			this.iLastSequenceNumber = (Long) seqNumProp.getValue();
+			this.iLastSequenceContext = (String) pSeqCtxProp.getValue();
+			this.iLastSequenceNumber = (Long) pSeqNumProp.getValue();
 			this.iExpectedSequenceNumber = this.iLastSequenceNumber.longValue() + 1;
 			// this.iLastArrivalTime = arrivalTime;
 
@@ -517,8 +518,8 @@
 			return;
 		}
 
-		String seqCtx = (String) seqCtxProp.getValue();
-		Long seqNum = (Long) seqNumProp.getValue();
+		String seqCtx = (String) pSeqCtxProp.getValue();
+		Long seqNum = (Long) pSeqNumProp.getValue();
 		long seqNumVal = seqNum.longValue();
 
 		// Indication arrived after sequence identifier lifetime of previous