Merge branch 'master' into Issue-108639-WEB-request-tabId

Author: dmendez

java/src/main/java/com/genexus/sap/EnterpriseConnect.java

@@ -33,10 +33,12 @@ public class EnterpriseConnect
 
 	public EnterpriseConnect(ModelContext context)
 	{
-		Object destination = context.getContextProperty("SAPSessionName");
-		if (destination !=null)
-		{
-			destinationName = (String)destination;
+		if (context !=null) {
+			Object destination = context.getContextProperty("SAPSessionName");
+			if (destination !=null)
+			{
+				destinationName = (String)destination;
+			}
 		}
 	}
 
@@ -171,8 +173,11 @@ else if (jcoType == JCoMetaData.TYPE_DATE)
 						{
 							jTable.setValue(key, jObj.getString(key));
 						}
-						else if (jcoType == JCoMetaData.TYPE_INT2 || jcoType == JCoMetaData.TYPE_INT1 
-							      || jcoType == JCoMetaData.TYPE_BYTE)
+						else if (jcoType == JCoMetaData.TYPE_BYTE)
+						{
+							jTable.setValue(key, jObj.getString(key));
+						}
+						else if (jcoType == JCoMetaData.TYPE_INT2 || jcoType == JCoMetaData.TYPE_INT1)
 						{
 							jTable.setValue(key, jObj.getInt(key));
 						}
@@ -228,8 +233,11 @@ else if (jcoType == JCoMetaData.TYPE_DATE)
 					{
 						jStruct.setValue(key, jObj.getString(key));
 					}
-					else if (jcoType == JCoMetaData.TYPE_INT2 || jcoType == JCoMetaData.TYPE_INT1 
-					      || jcoType == JCoMetaData.TYPE_BYTE)
+					else if (jcoType == JCoMetaData.TYPE_BYTE)
+					{
+						jStruct.setValue(key, jObj.getString(key));
+					}
+					else if (jcoType == JCoMetaData.TYPE_INT2 || jcoType == JCoMetaData.TYPE_INT1)
 					{
 						jStruct.setValue(key, jObj.getInt(key));
 					}
@@ -275,8 +283,11 @@ public void getValue(String parameterName, GXSimpleCollection<?>[] value)
 						{
 							jRow.put(field.getName(), field.getLong());
 						}
-						else if (field.getType() == JCoMetaData.TYPE_INT2 || field.getType() == JCoMetaData.TYPE_INT1 
-								|| field.getType() == JCoMetaData.TYPE_BYTE )
+						else if (field.getType() == JCoMetaData.TYPE_BYTE )
+						{
+							jRow.put(field.getName(), new String(field.getByteArray()));
+						}
+						else if (field.getType() == JCoMetaData.TYPE_INT2 || field.getType() == JCoMetaData.TYPE_INT1)
 						{
 							jRow.put(field.getName(), field.getInt());
 						}
@@ -340,6 +351,11 @@ public void getValue(String parameterName, java.util.Date[] value)
 		value[0] = function.getExportParameterList().getDate(parameterName);
 	}		
 
+	public void getValue(String parameterName, byte[] value)
+	{		
+		value[0] = function.getExportParameterList().getByte(parameterName);
+	}
+	
 	public void getValue(String parameterName, int[] value)
 	{		
 		value[0] = function.getExportParameterList().getInt(parameterName);

java/src/main/java/com/genexus/sap/SessionManager.java

@@ -156,7 +156,7 @@ public void TransactionBegin()
 				scopeName  = String.valueOf( scopeObj);
 				Log.info("GX SAP - Begin Transaction " +  destinationName);
 				JCoDestination destination = null;
-				if (scopeName.isEmpty()) 
+				if (scopeName.isEmpty() || scopeName.equals("null"))
 					destination = JCoDestinationManager.getDestination(destinationName);		
 				else 	
 					destination = JCoDestinationManager.getDestination(destinationName, scopeName);		
@@ -182,7 +182,7 @@ public void TransactionCommit()
 				JCoDestination destination = null;
 				destinationName = (String)destinationObj;
 				scopeName = String.valueOf(scopeObject);
-				if ( scopeName.isEmpty() ) {
+				if ( scopeName.isEmpty() || scopeName.equals("null") ) {
 					destination = JCoDestinationManager.getDestination(destinationName);
 				}
 				else {

pom.xml

@@ -14,7 +14,7 @@
 	<url>https://github.com/genexuslabs/JavaClasses</url>
 
 	<properties>
-		<revision>4.6</revision>
+		<revision>4.7</revision>
 		<changelist>-SNAPSHOT</changelist>
 		<sha1/>