Skip to content

Commit 21e2b7e

Browse files
committed
Merge pull request #99 from scouter-project/master
Merge for release
2 parents fa169d0 + f570239 commit 21e2b7e

File tree

77 files changed

+881
-983
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+881
-983
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ scouter.server/conf/account_group.xml
3030
scouter.server/database/
3131
scouter.client.product/plugin_customization.ini
3232
scouter.client/plugin_customization.ini
33+
scouter.client/scouter.client.jar
3334

3435
*/*.scouter
3536

build_client.sh

100644100755
File mode changed.

build_package.sh

100644100755
File mode changed.

scouter.agent.host/scripts/host.sh

100644100755
File mode changed.

scouter.agent.host/scripts/readlink.sh

100644100755
File mode changed.

scouter.agent.host/scripts/sample1.host.sh

100644100755
File mode changed.

scouter.agent.host/scripts/sample2.host.sh

100644100755
File mode changed.

scouter.agent.host/scripts/sample2.stop.sh

100644100755
File mode changed.

scouter.agent.host/scripts/stop.sh

100644100755
File mode changed.

scouter.agent.java/src/scouter/agent/AgentTransformer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
148148
cr.accept(cv, ClassReader.EXPAND_FRAMES);
149149
classfileBuffer = cw.toByteArray();
150150
cv = cw = getClassWriter(classDesc);
151-
if (conf.log_asm_enabled) {
151+
if (conf._log_asm_enabled) {
152152
if (this.bciOut == null) {
153153
this.bciOut = new Logger.FileLog("./scouter.bci");
154154
}

0 commit comments

Comments
 (0)