Skip to content

Commit

Permalink
Merge pull request #7 from mumianhua/develop
Browse files Browse the repository at this point in the history
yyy
  • Loading branch information
sophiawangTron authored Nov 21, 2023
2 parents 82da859 + 7824f85 commit 0570e47
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/pullrequesttarget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ jobs:
username: ${{ github.triggering_actor }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: out
if: steps.checkAccess.outputs.require-result == 'false'
run: |
exit 0
- name: Check Permission
uses: myrotvorets/set-commit-status-action@master
if: steps.checkAccess.outputs.require-result == 'false'
Expand All @@ -30,10 +34,6 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
allowForks: true
status: pending
- name: out
if: steps.checkAccess.outputs.require-result == 'false'
run: |
exit 0
- name: Run tests
run: |
echo "n${{ github.actor }}"
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/org/tron/common/utils/ByteArray.java
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public static byte[] fromObject(Object obj) {
objectOutputStream.flush();
bytes = byteArrayOutputStream.toByteArray();
} catch (IOException e) {
logger.error("objectToByteArray fffffailed: " + e.getMessage(), e);
logger.error("objectToByteArray ffffailed: " + e.getMessage(), e);
}
return bytes;
}
Expand Down

0 comments on commit 0570e47

Please sign in to comment.