You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/06/02 13:57:58 UTC

[commons-imaging] branch master updated (07e65e4d -> b3e60610)

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git


    from 07e65e4d Trying to fix GHA build
     new 24446639 Better internal class name
     new b3e60610 Trying to fix GHA build

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/maven.yml                                      | 9 +++++----
 .../apache/commons/imaging/bytesource/ByteSourceInputStream.java | 5 +++--
 2 files changed, 8 insertions(+), 6 deletions(-)


[commons-imaging] 02/02: Trying to fix GHA build

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git

commit b3e606107490351b9d118242bd38446b5f292400
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 2 09:57:54 2023 -0400

    Trying to fix GHA build
---
 .github/workflows/maven.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index e8bfe42d..f34a129f 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -37,10 +37,11 @@ jobs:
         
     steps:
     # https://github.com/actions/checkout/issues/226#issuecomment-854736025
-#    - name: Prepare git
-#      run: |-
-#        git config --global core.autocrlf false
-#        git config --global core.eol lf
+    # Why is this not an issue in other Apache Commons repos?
+    - name: Prepare git
+      run: |-
+        git config --global core.autocrlf false
+        git config --global core.eol lf
     - uses: actions/checkout@v3.5.2
       with:
         persist-credentials: false


[commons-imaging] 01/02: Better internal class name

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git

commit 2444663968afb4c235746176d5b369a96533c882
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 2 09:53:19 2023 -0400

    Better internal class name
---
 .../org/apache/commons/imaging/bytesource/ByteSourceInputStream.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/commons/imaging/bytesource/ByteSourceInputStream.java b/src/main/java/org/apache/commons/imaging/bytesource/ByteSourceInputStream.java
index be755a09..7441fd21 100644
--- a/src/main/java/org/apache/commons/imaging/bytesource/ByteSourceInputStream.java
+++ b/src/main/java/org/apache/commons/imaging/bytesource/ByteSourceInputStream.java
@@ -30,6 +30,7 @@ import org.apache.commons.io.IOUtils;
 class ByteSourceInputStream extends ByteSource {
 
     private class CacheBlock {
+
         public final byte[] bytes;
         private CacheBlock next;
         private boolean triedNext;
@@ -52,7 +53,7 @@ class ByteSourceInputStream extends ByteSource {
 
     }
 
-    private class CacheReadingInputStream extends InputStream {
+    private class CachingInputStream extends InputStream {
         private CacheBlock block;
         private boolean readFirst;
         private int blockIndex;
@@ -216,7 +217,7 @@ class ByteSourceInputStream extends ByteSource {
 
     @Override
     public InputStream getInputStream() throws IOException {
-        return new CacheReadingInputStream();
+        return new CachingInputStream();
     }
 
     private CacheBlock readBlock() throws IOException {