Skip to content

Commit df934cb

Browse files
committed
Fix Windows File Util compilation errors; update version to 4.0.1
1 parent d8da8d8 commit df934cb

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ This project uses a semver-parsable X.0.Z version number for releases, where X i
1919
Non-release versions of this project (for example on github.com/RuntimeTools/omr-agentcore) will use semver-parsable X.0.Z-dev.B version numbers, where X.0.Z is the last release with Z incremented and B is an integer. For further information on the development process go to the [appmetrics wiki][3]: [Developing](https://github.com/RuntimeTools/appmetrics/wiki/Developing).
2020

2121
## Version
22-
4.0.0
22+
4.0.1
2323

2424
## Release History
25+
`4.0.1` - Fix Windows FileUtil compilation errors.
2526
`4.0.0` - Fixes for z/OS API connections and semaphore reuse.
2627
`3.2.9` - Build fixes for Node 10.
2728
`3.2.8` - Initial support for iPASE systems.

binding.gyp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# "externalbinariesdir%": "<(PRODUCT_DIR)/deploy/external/binaries",
66
"externalbinariesdir%": "./plugins",
77
'build_id%': '.<!(["python", "./generate_build_id.py"])',
8-
'coreversion%': '4.0.0',
8+
'coreversion%': '4.0.1',
99
"conditions": [
1010
['OS=="aix"', {
1111
"portdir": "aix",

src/ibmras/common/util/FileUtils.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ bool createDirectory(std::string& path) {
7979
IBMRAS_DEBUG(warning, "The network path was not found.");
8080
break;
8181
default:
82-
IBMRAS_DEBUG(fine, "Directory %s could not be found, permissions? Attempting creation.", pathName);
82+
IBMRAS_DEBUG_1(fine, "Directory %s could not be found, permissions? Attempting creation.", pathName);
8383
if(!CreateDirectory(reinterpret_cast<LPCTSTR>(pathName), NULL)) {
8484
switch (GetLastError()) {
8585
case ERROR_ALREADY_EXISTS:
@@ -144,7 +144,7 @@ bool createFile(std::string& path) {
144144
switch (GetLastError()) {
145145
case ERROR_PATH_NOT_FOUND:
146146
IBMRAS_DEBUG_1(fine, "File %s was not found. Attempting to create.", pathName);
147-
fileHandle = CreateFile(reinterpret_cast<LPCTSTR>(pathName), NULL, (GENERIC_READ | GENERIC_WRITE), 0, (FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE), NULL, CREATE_NEW, FILE_ATTRIBUTE_HIDDEN, NULL);
147+
fileHandle = CreateFile(reinterpret_cast<LPCTSTR>(pathName), (GENERIC_READ | GENERIC_WRITE), (FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE), NULL, CREATE_NEW, FILE_ATTRIBUTE_HIDDEN, NULL);
148148
if(INVALID_HANDLE_VALUE == fileHandle) {
149149
switch (GetLastError()) {
150150
//if the directory already exists we will use it instead of the current one.
@@ -169,7 +169,7 @@ bool createFile(std::string& path) {
169169
break;
170170
default:
171171
IBMRAS_DEBUG_1(fine, "File %s could not be found, permissions? Attempting to create", pathName);
172-
fileHandle = CreateFile(reinterpret_cast<LPCTSTR>(pathName), NULL, (GENERIC_READ | GENERIC_WRITE), 0, (FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE), NULL, CREATE_NEW, FILE_ATTRIBUTE_HIDDEN, NULL);
172+
fileHandle = CreateFile(reinterpret_cast<LPCTSTR>(pathName), (GENERIC_READ | GENERIC_WRITE), (FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE), NULL, CREATE_NEW, FILE_ATTRIBUTE_HIDDEN, NULL);
173173
if(INVALID_HANDLE_VALUE == fileHandle) {
174174
switch (GetLastError()) {
175175
case ERROR_FILE_EXISTS:

src/ibmras/monitoring/agent/Agent.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ std::string Agent::getBuildDate() {
192192
}
193193

194194
std::string Agent::getVersion() {
195-
return "4.0.0";
195+
return "4.0.1";
196196
}
197197

198198
void Agent::setLogLevels() {

0 commit comments

Comments
 (0)