Skip to content

Commit 11cfef3

Browse files
committed
Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java
Issue: 105607 d844074
1 parent 04003dc commit 11cfef3

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

gxweb/src/main/java/com/genexus/webpanels/GXWebRow.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.genexus.webpanels;
22

3+
import java.util.ArrayList;
34
import java.util.Iterator;
45

56
import com.genexus.CommonUtil;
@@ -114,6 +115,7 @@ public void AddColumnProperties(int valueIndex, boolean valueWithProps, Object[]
114115
boolean equal = it != null && !((HttpContext)context.getHttpContext()).isAjaxCallMode() ;
115116
Object current = null;
116117

118+
ArrayList<Object> myArrayList = new ArrayList<Object>();;
117119
for (int i = props.length - 1; i >= 0; i--)
118120
{
119121
Object prop = props[i];
@@ -129,7 +131,7 @@ public void AddColumnProperties(int valueIndex, boolean valueWithProps, Object[]
129131
{
130132
equal = false;
131133
try{
132-
colProps.put(0, prop);
134+
myArrayList.add(0, prop);
133135
}catch (JSONException e){}
134136
if (it == null)
135137
colPropsRev.put(prop);
@@ -143,6 +145,9 @@ else if (valueWithProps)
143145
_Values.put(prop);
144146
}
145147
}
148+
if (myArrayList.size() > 0)
149+
colProps.putAll(myArrayList);
150+
146151
if (this._parentGrid != null && it == null) // If is the first Row.
147152
{
148153
this._parentGrid.GetColsPropsCommon().add(colPropsRev);

0 commit comments

Comments
 (0)