Skip to content

CAMEL-24121: camel-smb - Add connectIfNecessary to existsFile and storeFileDirectly#24787

Merged
davsclaus merged 1 commit into
mainfrom
fix/CAMEL-24121
Jul 16, 2026
Merged

CAMEL-24121: camel-smb - Add connectIfNecessary to existsFile and storeFileDirectly#24787
davsclaus merged 1 commit into
mainfrom
fix/CAMEL-24121

Conversation

@davsclaus

Copy link
Copy Markdown
Contributor

Summary

SmbOperations.existsFile() accesses the share field without calling connectIfNecessary() first. When tempPrefix or tempFileName is configured on the producer, GenericFileProducer.processExchange() calls existsFile() before any storeFile(), and since SmbEndpoint.isSingletonProducer() returns false, every exchange gets a fresh, unconnected SmbOperations — so share is always null, causing an NPE on every message.

Changes

  • SmbOperations.existsFile() — added connectIfNecessary() and safeDisconnect error handling, matching the pattern used by deleteFile(), existsFolder(), renameFile(), etc.
  • SmbOperations.storeFileDirectly() — added connectIfNecessary() (used for checksum file writing, had the same missing guard).
  • New IT: SmbProducerTempPrefixIT — verifies that tempPrefix=.uploading works on the SMB producer.

Test plan

  • New SmbProducerTempPrefixIT passes (sends a file with tempPrefix, verifies it arrives at the expected path)
  • Full camel-smb test suite passes (81 tests, 0 failures)

Claude Code on behalf of @davsclaus

Co-Authored-By: Claude Opus 4.6 noreply@anthropic.com

…reFileDirectly

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Claus Ibsen <claus.ibsen@gmail.com>
@github-actions

Copy link
Copy Markdown
Contributor

🌟 Thank you for your contribution to the Apache Camel project! 🌟
🤖 CI automation will test this PR automatically.

🐫 Apache Camel Committers, please review the following items:

  • First-time contributors require MANUAL approval for the GitHub Actions to run
  • You can use the command /component-test (camel-)component-name1 (camel-)component-name2.. to request a test from the test bot although they are normally detected and executed by CI.
  • You can label PRs using skip-tests and test-dependents to fine-tune the checks executed by this PR.
  • Build and test logs are available in the summary page. Only Apache Camel committers have access to the summary.

⚠️ Be careful when sharing logs. Review their contents before sharing them publicly.

@gnodet gnodet left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct fix for a real NPE bug — existsFile() and storeFileDirectly() were the only two share-accessing methods that didn't call connectIfNecessary() first.

The bug: When tempPrefix or tempFileName is configured, GenericFileProducer.processExchange() calls existsFile() before storeFile(). Since SmbEndpoint.isSingletonProducer() returns false, every exchange gets a fresh, unconnected SmbOperations — so share is null, causing NPE.

The fix follows the established pattern exactly:

  • existsFile() — mirrors existsFolder(): connectIfNecessary() + try/catch(SMBRuntimeException) with safeDisconnect(smbre)
  • storeFileDirectly() — adds connectIfNecessary() (already has its own try/catch(IOException)) ✅

Test is well-structured:

  • SmbProducerTempPrefixIT follows the same pattern as the 15+ existing SmbProducer*IT tests (extends SmbServerTestSupport, uses sendFile(), Awaitility with explicit timeout)
  • Verifies the exact scenario that would NPE: sending a file with tempPrefix=.uploading

Static analysis: ast-grep ran — no new findings introduced (all findings are pre-existing in the file).

Checklist:

  • ✅ Fix matches the connectIfNecessary() + safeDisconnect() pattern used by deleteFile(), existsFolder(), renameFile(), buildDirectory(), retrieveFile(), storeFile()
  • ✅ New IT covers the tempPrefix scenario
  • ✅ Commit convention followed
  • ✅ CI pending (builds running)

Reviewed with Claude Code (claude-code/1.0) on behalf of gnodet. This review was generated by an AI agent and may contain inaccuracies; please verify all suggestions before applying.

@github-actions

Copy link
Copy Markdown
Contributor

🧪 CI tested the following changed modules:

  • components/camel-smb

🔬 Scalpel shadow comparison — Scalpel: 9 tested, 29 compile-only — current: 9 all tested

Maveniverse Scalpel detected 38 affected modules (current approach: 9).

⚠️ Modules only in Scalpel (29)
  • apache-camel
  • camel-allcomponents
  • camel-catalog
  • camel-catalog-console
  • camel-catalog-lucene
  • camel-catalog-maven
  • camel-catalog-suggest
  • camel-componentdsl
  • camel-csimple-maven-plugin
  • camel-endpointdsl
  • camel-endpointdsl-support
  • camel-itest
  • camel-jbang-core
  • camel-jbang-it
  • camel-jbang-main
  • camel-jbang-plugin-edit
  • camel-jbang-plugin-generate
  • camel-jbang-plugin-kubernetes
  • camel-jbang-plugin-test
  • camel-kamelet-main
  • camel-launcher
  • camel-report-maven-plugin
  • camel-route-parser
  • camel-yaml-dsl
  • camel-yaml-dsl-deserializers
  • camel-yaml-dsl-maven-plugin
  • coverage
  • docs
  • dummy-component

Skip-tests mode would test 9 modules (1 direct + 8 downstream), skip tests for 29 (generated code, meta-modules)

Modules Scalpel would test (9)
  • camel-jbang-mcp
  • camel-jbang-plugin-mcp
  • camel-jbang-plugin-route-parser
  • camel-jbang-plugin-tui
  • camel-jbang-plugin-validate
  • camel-launcher-container
  • camel-smb
  • camel-yaml-dsl-validator
  • camel-yaml-dsl-validator-maven-plugin
Modules with tests skipped (29)
  • apache-camel
  • camel-allcomponents
  • camel-catalog
  • camel-catalog-console
  • camel-catalog-lucene
  • camel-catalog-maven
  • camel-catalog-suggest
  • camel-componentdsl
  • camel-csimple-maven-plugin
  • camel-endpointdsl
  • camel-endpointdsl-support
  • camel-itest
  • camel-jbang-core
  • camel-jbang-it
  • camel-jbang-main
  • camel-jbang-plugin-edit
  • camel-jbang-plugin-generate
  • camel-jbang-plugin-kubernetes
  • camel-jbang-plugin-test
  • camel-kamelet-main
  • camel-launcher
  • camel-report-maven-plugin
  • camel-route-parser
  • camel-yaml-dsl
  • camel-yaml-dsl-deserializers
  • camel-yaml-dsl-maven-plugin
  • coverage
  • docs
  • dummy-component

ℹ️ Shadow mode — Scalpel observes but does not affect test execution. Learn more

All tested modules (38 modules)
  • Camel :: All Components Sync point
  • Camel :: Assembly
  • Camel :: Catalog :: CSimple Maven Plugin (deprecated)
  • Camel :: Catalog :: Camel Catalog
  • Camel :: Catalog :: Camel Report Maven Plugin
  • Camel :: Catalog :: Camel Route Parser
  • Camel :: Catalog :: Console
  • Camel :: Catalog :: Dummy Component
  • Camel :: Catalog :: Lucene (deprecated)
  • Camel :: Catalog :: Maven
  • Camel :: Catalog :: Suggest
  • Camel :: Component DSL
  • Camel :: Coverage
  • Camel :: Docs
  • Camel :: Endpoint DSL
  • Camel :: Endpoint DSL :: Support
  • Camel :: Integration Tests
  • Camel :: JBang :: Core
  • Camel :: JBang :: Integration tests
  • Camel :: JBang :: MCP
  • Camel :: JBang :: Main
  • Camel :: JBang :: Plugin :: Edit
  • Camel :: JBang :: Plugin :: Generate
  • Camel :: JBang :: Plugin :: Kubernetes
  • Camel :: JBang :: Plugin :: MCP
  • Camel :: JBang :: Plugin :: Route Parser
  • Camel :: JBang :: Plugin :: TUI
  • Camel :: JBang :: Plugin :: Testing
  • Camel :: JBang :: Plugin :: Validate
  • Camel :: Kamelet Main
  • Camel :: Launcher
  • Camel :: Launcher :: Container
  • Camel :: SMB
  • Camel :: YAML DSL
  • Camel :: YAML DSL :: Deserializers
  • Camel :: YAML DSL :: Maven Plugins
  • Camel :: YAML DSL :: Validator
  • Camel :: YAML DSL :: Validator Maven Plugin

⚙️ View full build and test results

@davsclaus davsclaus added this to the 4.22.0 milestone Jul 16, 2026
@davsclaus davsclaus self-assigned this Jul 16, 2026
@davsclaus davsclaus added the bug Something isn't working label Jul 16, 2026
@davsclaus
davsclaus merged commit 658b99f into main Jul 16, 2026
5 checks passed
@davsclaus
davsclaus deleted the fix/CAMEL-24121 branch July 16, 2026 13:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working components

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants