midsuit
/
core-jgi
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* added check to avoid infinite recursion

This commit is contained in:
Heng Sin Low 2007-06-13 00:01:47 +00:00
parent 2e23edc9c9
commit 0dc865317d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
base/src/org/compiere/model/MLookup.java
View File

@ -69,7 +69,7 @@ public final class MLookup extends Lookup implements Serializable
// if (TabNo != 0) // if (TabNo != 0)
// m_loader.setPriority(Thread.NORM_PRIORITY - 1); // m_loader.setPriority(Thread.NORM_PRIORITY - 1);
m_loader.start(); m_loader.start();
// m_loader.run(); // test sync call //m_loader.run(); // test sync call
} // MLookup } // MLookup
/** Inactive Marker Start */ /** Inactive Marker Start */
@ -346,6 +346,7 @@ public final class MLookup extends Lookup implements Serializable
boolean validated = this.isValidated(m_info); boolean validated = this.isValidated(m_info);
if (validated) if (validated)
return new ArrayList<Object>(m_lookup.values()); return new ArrayList<Object>(m_lookup.values());
//if (!m_info.IsValidated && onlyValidated) //if (!m_info.IsValidated && onlyValidated)
if (!validated && onlyValidated) if (!validated && onlyValidated)
@ -369,7 +370,7 @@ public final class MLookup extends Lookup implements Serializable
{ {
// create list // create list
ArrayList<Object> list = getData (onlyValidated, temporary); ArrayList<Object> list = getData (onlyValidated, temporary);
// Remove inactive choices // Remove inactive choices
if (onlyActive && m_hasInactive) if (onlyActive && m_hasInactive)
{ {
@ -540,16 +541,18 @@ public final class MLookup extends Lookup implements Serializable
*/ */
public int refresh () public int refresh ()
{ {
if (m_refreshing) return 0;
return refresh(true); return refresh(true);
} // refresh } // refresh
/** /**
* Refresh & return number of items read * Refresh & return number of items read
* @param loadParent get data of parent lookups * @param loadParent get data of parent lookups
* @return no of items read * @return no of items refresh
*/ */
public int refresh (boolean loadParent) public int refresh (boolean loadParent)
{ {
if (m_refreshing) return 0;
if (!loadParent && m_info.IsParent) if (!loadParent && m_info.IsParent)
return 0; return 0;
// Don't load Search or CreatedBy/UpdatedBy // Don't load Search or CreatedBy/UpdatedBy