Apply patch for bug #248678
diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/IBMLLRMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/IBMLLRMLaunchConfigurationDynamicTab.java
index 52e5d22..78a8231 100644
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/IBMLLRMLaunchConfigurationDynamicTab.java
+++ b/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/IBMLLRMLaunchConfigurationDynamicTab.java
@@ -1332,6 +1332,7 @@
createLimitsTab(rm);
print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
+ ":createControl returning.");
+ currentRM = rm; //DRW-09-22-08 Fix null pointer exception in validating fields
}
/**
@@ -2344,13 +2345,13 @@
// LL_PTP_NETWORK_LAPI);
// llNetwork_mpi_lapi = createTextWidget(nodesNetworkTabPane, rm,
// LL_PTP_NETWORK_MPI_LAPI);
- validateNumericRange(llNodeMin, LL_PTP_NODE_MIN, "Invalid.llNodeMin");
- validateNumericRange(llNodeMax, LL_PTP_NODE_MAX, "Invalid.llNodeMax");
+//drw validateNumericRange(llNodeMin, LL_PTP_NODE_MIN, "Invalid.llNodeMin");
+//drw validateNumericRange(llNodeMax, LL_PTP_NODE_MAX, "Invalid.llNodeMax");
//no checks will be performed on the following widgets at this time
// llTaskGeometry = createTextWidget(nodesNetworkTabPane, rm,
// LL_PTP_TASK_GEOMETRY);
- validatePositiveNumeric(llTasksPerNode,"Invalid.llTasksPerNode");
- validatePositiveNumeric(llTotalTasks,"Invalid.llTotalTasks");
+//drw validatePositiveNumeric(llTasksPerNode,"Invalid.llTasksPerNode");
+//drw validatePositiveNumeric(llTotalTasks,"Invalid.llTotalTasks");
print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
+ ":validateNodesNetworkTab returning.");
@@ -2674,6 +2675,8 @@
print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
+ ":validateNumericRange entered.");
+ IAttributeDefinition def;
+ def = currentRM.getAttributeDefinition(attrName);
attrDef = (IntegerAttributeDefinition) currentRM
.getAttributeDefinition(attrName);
try {
diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/src/ptp_ibmpe_proxy.c b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/src/ptp_ibmpe_proxy.c
index 0848954..cf35507 100755
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/src/ptp_ibmpe_proxy.c
+++ b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/src/ptp_ibmpe_proxy.c
@@ -508,10 +508,12 @@
*/
{"MP_PMDLOG_DIR", ATTR_ALWAYS_ALLOWED, "PMD Log Directory",
"Specify directory where PMD log is generated (MP_PMDLOG_DIR)", ""},
+#if 0
{"MP_PRIORITY_LOG_DIR", ATTR_FOR_AIX | ATTR_FOR_ALL_PROXY, "Priority Log Directory",
"Specify directory containing co-scheduler log (MP_PRIORITY_LOG_DIR)", "/tmp"},
{"MP_PRIORITY_LOG_NAME", ATTR_FOR_AIX | ATTR_FOR_ALL_PROXY, "Priority Log Name",
"Specify name of co-scheduler log (MP_PRIORITY_LOG_NAME)", "pmadjpri.log"},
+#endif
/*
* Debug related attributes
*/
