Merge pull request #38 from tknie/main

Synchronize call with on Adabas ID

Author: thknieling

adabas/adabas_message_test.go

@@ -101,7 +101,7 @@ func TestAdabasMessageTranslate(t *testing.T) {
 	ada.Acbx.Acbxrsp = AdaNormal
 	assert.Equal(t, "Erfolgreich beendet (rsp=0,subrsp=0,dbid=21,file=0)", NewError(ada).Translate("de"))
 	ada.Acbx.Acbxrsp = AdaInvalidFileNumber
-	assert.Equal(t, "Falscher oder nicht authorizierte File-Nummer (rsp=17,subrsp=0,dbid=21,file=0)", NewError(ada).Translate("de"))
+	assert.Equal(t, "Falsche oder nicht authorizierte File-Nummer (rsp=17,subrsp=0,dbid=21,file=0)", NewError(ada).Translate("de"))
 	ada.Acbx.Acbxerrc = AdaISNNotSorted
 	assert.Equal(t, "The program tried to access system file 1 or 2, and no OP command was issued. (rsp=17,subrsp=1,dbid=21,file=0)", NewError(ada).Translate("de"))
 	ada.Acbx.Acbxrsp = 120

adabas/adabasstructure.go

@@ -22,6 +22,7 @@ package adabas
 import (
 	"bytes"
 	"fmt"
+	"sync"
 	"sync/atomic"
 	"time"
 	"unsafe"
@@ -167,6 +168,7 @@ type Status struct {
 	platform         *adatypes.Platform
 	adabas           *Adabas
 	version          string
+	lock             sync.Mutex
 }
 
 // ID Adabas Id

adabas/call.go

@@ -69,6 +69,9 @@ func NewAdabasID() *ID {
 // AdabasClient library support
 func (adabas *Adabas) CallAdabas() (err error) {
 	defer TimeTrack(time.Now(), "Call adabas", adabas)
+	s := adabas.status
+	s.lock.Lock()
+	defer s.lock.Unlock()
 
 	if adatypes.Central.IsDebugLevel() {
 		adatypes.Central.Log.Debugf("Send calling CC %c%c adabasp=%p URL=%s Adabas ID=%v",

adabas/rcall.go

@@ -69,6 +69,9 @@ func NewAdabasID() *ID {
 // AdabasClient library support
 func (adabas *Adabas) CallAdabas() (err error) {
 	defer TimeTrack(time.Now(), "RCall adabas", adabas)
+	s := adabas.status
+	s.lock.Lock()
+	defer s.lock.Unlock()
 
 	if adatypes.Central.IsDebugLevel() {
 		adatypes.Central.Log.Debugf("Call Adabas (local disabled) adabasp=%p  %s%v", adabas, adabas.URL.String(), adabas.ID.String())

adatypes/common_type.go

@@ -24,7 +24,7 @@ import (
 )
 
 // Version version of current build
-var Version = "v1.6.15"
+var Version = "v1.6.16"
 
 // FieldType indicate a field type of the field
 type FieldType uint

adatypes/static_messages.go

@@ -131,7 +131,7 @@ var staticMessages = []struct {
 	{"ADAGE0F080", "de", "Reptor: Conversion to Open Systems FDT failed"},
 	{"ADAGE0F081", "de", "Reptor: Converted FDT exceeds buffer"},
 	{"ADAGE10000", "de", "Ein Teilkommand des MC Kommandos ist fehl geschlagen"},
-	{"ADAGE11000", "de", "Falscher oder nicht authorizierte File-Nummer"},
+	{"ADAGE11000", "de", "Falsche oder nicht authorizierte File-Nummer"},
 	{"ADAGE11001", "de", "The program tried to access system file 1 or 2, and no OP command was issued."},
 	{"ADAGE11002", "de", "The program tried to access system file 1 or 2, and the user is not authorized."},
 	{"ADAGE11004", "de", "One of the following occurred:- The specified file number is invalid. The file number might be equal to '0' or greater than the maximum allowed. When running with ADARUN DTP={RM | TM}, an attempt was made by a non-Adabas Transaction Manager user to access/update an Adabas Transaction Manager system file."},

messages/adabas.de

@@ -99,7 +99,7 @@ ADAGE0F07F=Reptor: No preceding Create FDT for Create Table
 ADAGE0F080=Reptor: Conversion to Open Systems FDT failed
 ADAGE0F081=Reptor: Converted FDT exceeds buffer
 ADAGE10000=Ein Teilkommand des MC Kommandos ist fehl geschlagen
-ADAGE11000=Falscher oder nicht authorizierte File-Nummer
+ADAGE11000=Falsche oder nicht authorizierte File-Nummer
 ADAGE11001=The program tried to access system file 1 or 2, and no OP command was issued.
 ADAGE11002=The program tried to access system file 1 or 2, and the user is not authorized.
 ADAGE11004=One of the following occurred:- The specified file number is invalid. The file number might be equal to "0" or greater than the maximum allowed. When running with ADARUN DTP={RM | TM}, an attempt was made by a non-Adabas Transaction Manager user to access/update an Adabas Transaction Manager system file.